Changeset 8729 for code/trunk/src/external/ois

Timestamp:

Jul 4, 2011, 2:47:44 AM (13 years ago)

Author:

rgrieder

Message:

Merged unity_build branch back to trunk.

Features:

• Implemented fully automatic build units to speed up compilation if requested
• Added DOUT macro for quick debug output
• Activated text colouring in the POSIX IOConsole
• DeclareToluaInterface is not necessary anymore

Improvements:

• Output levels now change appropriately when switch back and forth from dev mode
• Log level for the file output is now also correct during startup
• Removed some header file dependencies in core and tools to speed up compilation

no more file for command line options

• Improved util::tribool by adapting some concepts from boost::tribool

Regressions:

• It is not possible anymore to specify command line arguments in an extra file because we've got config values for that purpose.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/external/ois/CMakeLists.txt (modified) (4 diffs)
• src/external/ois/linux/CMakeLists.txt (modified) (2 diffs)
• src/external/ois/mac/CMakeLists.txt (modified) (2 diffs)
• src/external/ois/win32/CMakeLists.txt (modified) (2 diffs)

code/trunk/src/external/ois/CMakeLists.txt

@@ -35 +35 @@
   OISPrereqs.h
 
-#COMPILATION_BEGIN OISCompilation.cpp
   OISEffect.cpp
   OISException.cpp
@@ -43 +42 @@
   OISKeyboard.cpp
   OISObject.cpp
-#COMPILATION_END
 )
+
 IF(WIN32)
   ADD_SUBDIRECTORY(win32)
@@ -56 +55 @@
 IF(MINGW)
   INCLUDE_DIRECTORIES(${WMI_INCLUDE_DIR})
+ENDIF()
+
+# Apple has problems with OIS and build units
+IF(APPLE)
+  SET(USE_BUILD_UNITS NO_BUILD_UNITS)
 ENDIF()
 
@@ -72 +76 @@
   LINK_LIBS_LINUX
     X11
+  ${USE_BUILD_UNITS}
   SOURCE_FILES
     ${OIS_FILES}

code/trunk/src/external/ois/linux/CMakeLists.txt

@@ -8 +8 @@
   LinuxPrereqs.h
 
-COMPILATION_BEGIN OISLinuxCompilation.cpp
   EventHelpers.cpp
   LinuxForceFeedback.cpp
@@ -15 +14 @@
   LinuxKeyboard.cpp
   LinuxMouse.cpp
-COMPILATION_END
 )

code/trunk/src/external/ois/mac/CMakeLists.txt

@@ -8 +8 @@
   MacPrereqs.h
 
-#COMPILATION_BEGIN OISMacCompilation.cpp
   MacHelpers.cpp
   MacHIDManager.cpp
@@ -15 +14 @@
   MacKeyboard.cpp
   MacMouse.cpp
-#COMPILATION_END
 )

code/trunk/src/external/ois/win32/CMakeLists.txt

@@ -7 +7 @@
   Win32Prereqs.h
 
-COMPILATION_BEGIN OISWin32Compilation.cpp
   Win32ForceFeedback.cpp
   Win32InputManager.cpp
@@ -13 +12 @@
   Win32KeyBoard.cpp
   Win32Mouse.cpp
-COMPILATION_END
 )