Changeset 8625

Timestamp:

May 27, 2011, 6:28:58 PM (13 years ago)

Author:

rgrieder

Message:

Enable single build unit compiling for OIS too (doesn't work on OS X though).

Location:

code/branches/unity_build/src/external/ois

Files:

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

code/branches/unity_build/src/external/ois/CMakeLists.txt

@@ -34 +34 @@
   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
@@ -43 +49 @@
   OISKeyboard.cpp
   OISObject.cpp
-#END_BUILD_UNIT
 )
 IF(WIN32)
@@ -51 +56 @@
 ELSEIF(UNIX)
   ADD_SUBDIRECTORY(linux)
+ENDIF()
+
+# Close build unit from above
+IF(NOT APPLE)
+  ADD_SOURCE_FILES(OIS_FILES END_BUILD_UNIT)
 ENDIF()
 

code/branches/unity_build/src/external/ois/linux/CMakeLists.txt

@@ -8 +8 @@
   LinuxPrereqs.h
 
-BUILD_UNIT OISLinuxBuildUnit.cpp
   EventHelpers.cpp
   LinuxForceFeedback.cpp
@@ -15 +14 @@
   LinuxKeyboard.cpp
   LinuxMouse.cpp
-END_BUILD_UNIT
 )

code/branches/unity_build/src/external/ois/mac/CMakeLists.txt

@@ -8 +8 @@
   MacPrereqs.h
 
-#BUILD_UNIT OISMacBuildUnit.cpp
   MacHelpers.cpp
   MacHIDManager.cpp
@@ -15 +14 @@
   MacKeyboard.cpp
   MacMouse.cpp
-#END_BUILD_UNIT
 )

code/branches/unity_build/src/external/ois/win32/CMakeLists.txt

@@ -7 +7 @@
   Win32Prereqs.h
 
-BUILD_UNIT OISWin32BuildUnit.cpp
   Win32ForceFeedback.cpp
   Win32InputManager.cpp
@@ -13 +12 @@
   Win32KeyBoard.cpp
   Win32Mouse.cpp
-END_BUILD_UNIT
 )