Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 14, 2009, 10:53:45 PM (16 years ago)
Author:
rgrieder
Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:
code/branches/buildsystem3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem3

  • code/branches/buildsystem3/src/ois/CMakeLists.txt

    r1555 r2664  
    1 INCLUDE_DIRECTORIES(.)
     1 #
     2 #             ORXONOX - the hottest 3D action shooter ever to exist
     3 #                             > www.orxonox.net <
     4 #
     5 #        This program is free software; you can redistribute it and/or
     6 #         modify it under the terms of the GNU General Public License
     7 #        as published by the Free Software Foundation; either version 2
     8 #            of the License, or (at your option) any later version.
     9 #
     10 #       This program is distributed in the hope that it will be useful,
     11 #        but WITHOUT ANY WARRANTY; without even the implied warranty of
     12 #        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     13 #                 GNU General Public License for more details.
     14 #
     15 #   You should have received a copy of the GNU General Public License along
     16 #      with this program; if not, write to the Free Software Foundation,
     17 #     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     18 #
    219
    3 SET( OIS_SRC_FILES
     20SET_SOURCE_FILES(OIS_FILES
     21  OIS.h
     22  OISConfig.h
     23  OISEffect.h
     24  OISEvents.h
     25  OISException.h
     26  OISFactoryCreator.h
     27  OISForceFeedback.h
     28  OISInputManager.h
     29  OISInterface.h
     30  OISJoyStick.h
     31  OISKeyboard.h
     32  OISMouse.h
     33  OISObject.h
     34  OISPrereqs.h
     35
    436  OISEffect.cpp
    537  OISException.cpp
     
    1042  OISObject.cpp
    1143)
     44IF(WIN32)
     45  ADD_SUBDIRECTORY(win32)
     46ELSEIF(APPLE)
     47  ADD_SUBDIRECTORY(mac)
     48ELSEIF(UNIX)
     49  ADD_SUBDIRECTORY(linux)
     50ENDIF()
     51
     52GENERATE_SOURCE_GROUPS(${OIS_FILES})
     53
     54REMOVE_COMPILER_FLAGS("-DUNICODE -D_UNICODE" MSVC)
     55INCLUDE_DIRECTORIES(.)
     56
     57ADD_LIBRARY(ois_orxonox SHARED ${OIS_FILES})
     58SET_TARGET_PROPERTIES(ois_orxonox PROPERTIES DEFINE_SYMBOL "OIS_NONCLIENT_BUILD")
    1259
    1360IF(WIN32)
    14   SET( OIS_SRC_FILES ${OIS_SRC_FILES}
    15     win32/Win32ForceFeedback.cpp
    16     win32/Win32InputManager.cpp
    17     win32/Win32JoyStick.cpp
    18     win32/Win32KeyBoard.cpp
    19     win32/Win32Mouse.cpp
    20   )
    21 ELSEIF (APPLE)
    22   SET( OIS_SRC_FILES ${OIS_SRC_FILES}
    23     mac/MacHelpers.cpp
    24     mac/MacHIDManager.cpp
    25     mac/MacInputManager.cpp
    26     mac/MacKeyboard.cpp
    27     mac/MacMouse.cpp
    28   )
    29 ELSEIF (UNIX)
    30   SET( OIS_SRC_FILES ${OIS_SRC_FILES}
    31     linux/EventHelpers.cpp
    32     linux/LinuxForceFeedback.cpp
    33     linux/LinuxInputManager.cpp
    34     linux/LinuxJoyStickEvents.cpp
    35     linux/LinuxKeyboard.cpp
    36     linux/LinuxMouse.cpp
    37   )
    38 ENDIF (WIN32)
     61  TARGET_LINK_LIBRARIES(ois_orxonox ${DIRECTX_LIBRARIES})
     62ENDIF()
    3963
    40 ADD_LIBRARY( ois_orxonox SHARED ${OIS_SRC_FILES} )
    41 
    42 IF(WIN32)
    43   LINK_DIRECTORIES(${DirectX_LIB_DIR})
    44   TARGET_LINK_LIBRARIES( ois_orxonox
    45     dxguid
    46     dinput8
    47   )
    48 ENDIF(WIN32)
    49 
     64ORXONOX_INSTALL(ois_orxonox)
Note: See TracChangeset for help on using the changeset viewer.