Changeset 2621 for code/branches/buildsystem2/src/ois

Timestamp:

Jan 29, 2009, 11:35:54 PM (16 years ago)

Author:

rgrieder

Message:

This commit gets a little ugly, couldn't separate that anymore:

• Renamed UseTolua.cmake to GenerateLuaBindings.cmake
• Applied the macros for compiler flags, linker flags, header files and source groups Updated the whole build tree for that
• Created real compiler config scripts (BuildConfigGCC.cmake and BuildConfigMSVC.cmake)
• Large scale clean up in BuildConfig.cmake
• You can now specify your own LibraryConfig and BuildConfig script via CMake Cache
• Lots of small changes and fixes

Location:

code/branches/buildsystem2/src/ois

Files:

• CMakeLists.txt (modified) (2 diffs)
• linux/CMakeLists.txt (added)
• mac/CMakeLists.txt (added)
• win32/CMakeLists.txt (added)

code/branches/buildsystem2/src/ois/CMakeLists.txt

@@ -1 @@
-SET( OIS_SRC_FILES
+SET_SOURCE_FILES(OIS_FILES
+  OIS.h
+  OISConfig.h
+  OISEffect.h
+  OISEvents.h
+  OISException.h
+  OISFactoryCreator.h
+  OISForceFeedback.h
+  OISInputManager.h
+  OISInterface.h
+  OISJoyStick.h
+  OISKeyboard.h
+  OISMouse.h
+  OISObject.h
+  OISPrereqs.h
+
   OISEffect.cpp
   OISException.cpp
@@ -8 +23 @@
   OISObject.cpp
 )
-
 IF(WIN32)
-  SET( OIS_SRC_FILES ${OIS_SRC_FILES}
-    win32/Win32ForceFeedback.cpp
-    win32/Win32InputManager.cpp
-    win32/Win32JoyStick.cpp
-    win32/Win32KeyBoard.cpp
-    win32/Win32Mouse.cpp
-  )
-ELSEIF (APPLE)
-  SET( OIS_SRC_FILES ${OIS_SRC_FILES}
-    mac/MacHelpers.cpp
-    mac/MacHIDManager.cpp
-    mac/MacInputManager.cpp
-    mac/MacKeyboard.cpp
-    mac/MacMouse.cpp
-  )
-ELSEIF (UNIX)
-  SET( OIS_SRC_FILES ${OIS_SRC_FILES}
-    linux/EventHelpers.cpp
-    linux/LinuxForceFeedback.cpp
-    linux/LinuxInputManager.cpp
-    linux/LinuxJoyStickEvents.cpp
-    linux/LinuxKeyboard.cpp
-    linux/LinuxMouse.cpp
-  )
+  ADD_SUBDIRECTORY(win32)
+ELSEIF(APPLE)
+  ADD_SUBDIRECTORY(mac)
+ELSEIF(UNIX)
+  ADD_SUBDIRECTORY(linux)
 ENDIF (WIN32)
 
+GENERATE_SOURCE_GROUPS(${OIS_FILES})
+
+REMOVE_COMPILER_FLAGS("-DUNICODE -D_UNICODE" MSVC)
 INCLUDE_DIRECTORIES(.)
 
-ADD_LIBRARY( ois_orxonox SHARED ${OIS_SRC_FILES} )
+ADD_LIBRARY(ois_orxonox SHARED ${OIS_FILES} )
 SET_TARGET_PROPERTIES(ois_orxonox PROPERTIES DEFINE_SYMBOL "OIS_NONCLIENT_BUILD")
 
 IF(WIN32)
-  TARGET_LINK_LIBRARIES( ois_orxonox ${DirectX_LIBRARIES} )
+  TARGET_LINK_LIBRARIES( ois_orxonox ${DIRECTX_LIBRARIES} )
 ENDIF(WIN32)