Changeset 7567 for code

Timestamp:

Oct 20, 2010, 3:17:57 PM (14 years ago)

Author:

youngk

Message:

Changes for the compilation of OIS on the mac.

Location:

code/branches/ois_update

Files:

• cmake/tools/CheckOGREPlugins.cmake (modified) (1 diff)
• src/external/ois/CMakeLists.txt (modified) (1 diff)

code/branches/ois_update/cmake/tools/CheckOGREPlugins.cmake

@@ -53 +53 @@
       NAMES ${_plugin}
       PATHS $ENV{OGRE_HOME} $ENV{OGRE_PLUGIN_DIR}
-      PATH_SUFFIXES bin/Release bin/release Release release lib lib/OGRE bin
+      PATH_SUFFIXES bin/Release bin/release Release release lib lib/OGRE bin Ogre.framework/Resources
     )
     FIND_LIBRARY(OGRE_PLUGIN_${_plugin}_DEBUG
       NAMES ${_plugin}d ${_plugin}_d ${_plugin}
       PATHS $ENV{OGRE_HOME} $ENV{OGRE_PLUGIN_DIR}
-      PATH_SUFFIXES bin/Debug bin/debug Debug debug lib lib/OGRE bin
+      PATH_SUFFIXES bin/Debug bin/debug Debug debug lib lib/OGRE bin Ogre.framework/Resources
     )
     # We only need at least one render system. Check at the end.

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

@@ -65 +65 @@
 IF(WIN32)
   TARGET_LINK_LIBRARIES(ois_orxonox ${DIRECTX_LIBRARIES})
+ELSEIF(APPLE)
+  TARGET_LINK_LIBRARIES(ois_orxonox "/System/Library/Frameworks/IOKit.framework" "/System/Library/Frameworks/Carbon.framework")
 ENDIF()