[Orxonox-commit 3951] r8625 - in code/branches/unity_build/src/external/ois: . linux mac win32

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-05-27 18:28:58 +0200 (Fri, 27 May 2011)
New Revision: 8625

Modified:
   code/branches/unity_build/src/external/ois/CMakeLists.txt
   code/branches/unity_build/src/external/ois/linux/CMakeLists.txt
   code/branches/unity_build/src/external/ois/mac/CMakeLists.txt
   code/branches/unity_build/src/external/ois/win32/CMakeLists.txt
Log:
Enable single build unit compiling for OIS too (doesn't work on OS X though).

Modified: code/branches/unity_build/src/external/ois/CMakeLists.txt
===================================================================
--- code/branches/unity_build/src/external/ois/CMakeLists.txt	2011-05-27 16:20:34 UTC (rev 8624)
+++ code/branches/unity_build/src/external/ois/CMakeLists.txt	2011-05-27 16:28:58 UTC (rev 8625)
@@ -33,8 +33,14 @@
   OISMultiTouch.h
   OISObject.h
   OISPrereqs.h
+)
 
-#BUILD_UNIT OISBuildUnit.cpp
+# Put everything into one single build unit (doens't work on OS X though)
+IF(NOT APPLE)
+  ADD_SOURCE_FILES(OIS_FILES BUILD_UNIT OISBuildUnit.cpp)
+ENDIF()
+
+ADD_SOURCE_FILES(OIS_FILES
   OISEffect.cpp
   OISException.cpp
   OISForceFeedback.cpp
@@ -42,7 +48,6 @@
   OISJoyStick.cpp
   OISKeyboard.cpp
   OISObject.cpp
-#END_BUILD_UNIT
 )
 IF(WIN32)
   ADD_SUBDIRECTORY(win32)
@@ -52,6 +57,11 @@
   ADD_SUBDIRECTORY(linux)
 ENDIF()
 
+# Close build unit from above
+IF(NOT APPLE)
+  ADD_SOURCE_FILES(OIS_FILES END_BUILD_UNIT)
+ENDIF()
+
 # MinGW doesn't come with some required Windows headers
 IF(MINGW)
   INCLUDE_DIRECTORIES(${WMI_INCLUDE_DIR})

Modified: code/branches/unity_build/src/external/ois/linux/CMakeLists.txt
===================================================================
--- code/branches/unity_build/src/external/ois/linux/CMakeLists.txt	2011-05-27 16:20:34 UTC (rev 8624)
+++ code/branches/unity_build/src/external/ois/linux/CMakeLists.txt	2011-05-27 16:28:58 UTC (rev 8625)
@@ -7,12 +7,10 @@
   LinuxMouse.h
   LinuxPrereqs.h
 
-BUILD_UNIT OISLinuxBuildUnit.cpp
   EventHelpers.cpp
   LinuxForceFeedback.cpp
   LinuxInputManager.cpp
   LinuxJoyStickEvents.cpp
   LinuxKeyboard.cpp
   LinuxMouse.cpp
-END_BUILD_UNIT
 )

Modified: code/branches/unity_build/src/external/ois/mac/CMakeLists.txt
===================================================================
--- code/branches/unity_build/src/external/ois/mac/CMakeLists.txt	2011-05-27 16:20:34 UTC (rev 8624)
+++ code/branches/unity_build/src/external/ois/mac/CMakeLists.txt	2011-05-27 16:28:58 UTC (rev 8625)
@@ -7,12 +7,10 @@
   MacMouse.h
   MacPrereqs.h
 
-#BUILD_UNIT OISMacBuildUnit.cpp
   MacHelpers.cpp
   MacHIDManager.cpp
   MacInputManager.cpp
   MacJoyStick.cpp
   MacKeyboard.cpp
   MacMouse.cpp
-#END_BUILD_UNIT
 )

Modified: code/branches/unity_build/src/external/ois/win32/CMakeLists.txt
===================================================================
--- code/branches/unity_build/src/external/ois/win32/CMakeLists.txt	2011-05-27 16:20:34 UTC (rev 8624)
+++ code/branches/unity_build/src/external/ois/win32/CMakeLists.txt	2011-05-27 16:28:58 UTC (rev 8625)
@@ -6,11 +6,9 @@
   Win32Mouse.h
   Win32Prereqs.h
 
-BUILD_UNIT OISWin32BuildUnit.cpp
   Win32ForceFeedback.cpp
   Win32InputManager.cpp
   Win32JoyStick.cpp
   Win32KeyBoard.cpp
   Win32Mouse.cpp
-END_BUILD_UNIT
 )