Ver Fonte

OSX fixes

paulsapps há 11 anos atrás
pai
commit
519eba9412

+ 4 - 4
CMakeLists.txt

@@ -15,12 +15,12 @@ set(QGears_VERSION_PATCH 0)
 
 set(CMAKE_FRAMEWORK_PATH
       ${CMAKE_FRAMEWORK_PATH}
-       /Users/travis/build/q-gears/q-gears/OgreSDK/lib/macosx/Release
-       /Users/travis/build/q-gears/q-gears/OgreSDK/lib/macosx/Debug
+      ${CMAKE_CURRENT_SOURCE_DIR}/OgreSDK/lib/macosx/Release
+      ${CMAKE_CURRENT_SOURCE_DIR}/OgreSDK/lib/macosx/Debug
    )
 
 set(OGRE_FRAMEWORK_INCLUDES
-     /Users/travis/build/q-gears/q-gears/OgreSDK/include
+      ${CMAKE_CURRENT_SOURCE_DIR}/OgreSDK/include
 )
 
 option(QGears_BUILD_PLUGINS     "Build the plugins"     TRUE)
@@ -35,7 +35,7 @@ find_path(OGRE_CMAKE_MODULE_PATH FindOGRE.cmake
     "/usr/local/lib/OGRE/cmake"
     "/usr/lib/OGRE/cmake"
     "/usr/share/OGRE/cmake/modules"
-    "/Users/travis/build/q-gears/q-gears/OgreSDK/CMake"
+    "${CMAKE_CURRENT_SOURCE_DIR}/OgreSDK/CMake"
 )
 if(OGRE_CMAKE_MODULE_PATH-NOTFOUND)
     message(SEND_ERROR "Failed to find OGRE module path.")

+ 7 - 1
QGearsMain/CMakeLists.txt

@@ -329,6 +329,12 @@ add_executable(q-gears
   src/Main.cpp
 )
 
+
+if (APPLE)
+target_link_libraries(q-gears "-framework CoreFoundation -framework Cocoa -framework IOKit")
+endif()
+
+
 if( WIN32 AND NOT (CMAKE_BUILD_TYPE MATCHES "Debug") )
     set_target_properties( q-gears PROPERTIES WIN32_EXECUTABLE ON )
 	if (MSVC)
@@ -353,4 +359,4 @@ if(WIN32)
   install(TARGETS q-gears DESTINATION .)
 else()
   install(TARGETS q-gears RUNTIME DESTINATION ./games)
-endif()
+endif()

+ 1 - 1
Tests/CMakeLists.txt

@@ -2,7 +2,7 @@ add_definitions(
     -DBOOST_TEST_MODULE="standalone"
 )
 
-if(UNIX)
+if(UNIX OR APPLE)
     add_definitions(
         -DBOOST_TEST_DYN_LINK
     )

+ 1 - 0
Tests/QGearsMain/src/test_QGearsAFileSerializer.cpp

@@ -73,3 +73,4 @@ BOOST_AUTO_TEST_CASE( read_file )
 
     ifs->close();
 }
+

+ 4 - 0
utilities/ffix_model_exporter/CMakeLists.txt

@@ -25,6 +25,10 @@ add_executable(ff9_model_exporter
   ${SOURCE_FILES}
 )
 
+if (APPLE)
+target_link_libraries(ff9_model_exporter "-framework CoreFoundation -framework Cocoa -framework IOKit")
+endif()
+
 if(WIN32)
   set_target_properties(ff9_model_exporter PROPERTIES WIN32_EXECUTABLE ON)
   if (MSVC)

+ 4 - 0
utilities/ffix_sound_dumper/CMakeLists.txt

@@ -29,6 +29,10 @@ add_executable(ff9_sound_dumper
   ${SOURCE_FILES}
 )
 
+if (APPLE)
+target_link_libraries(ff9_sound_dumper "-framework CoreFoundation -framework Cocoa -framework IOKit")
+endif()
+
 if(WIN32)
   set_target_properties(ff9_sound_dumper PROPERTIES WIN32_EXECUTABLE ON)
   if (MSVC)

+ 5 - 0
utilities/ffvii_battle_model_exporter/CMakeLists.txt

@@ -32,6 +32,11 @@ add_executable(ff7_battle_model_exporter
   ${SOURCE_FILES}
 )
 
+if (APPLE)
+target_link_libraries(ff7_battle_model_exporter "-framework CoreFoundation -framework Cocoa -framework IOKit")
+endif()
+
+
 if(WIN32)
   set_target_properties(ff7_battle_model_exporter PROPERTIES WIN32_EXECUTABLE ON)
   if (MSVC)

+ 4 - 0
utilities/ffvii_battle_scene_dumper/CMakeLists.txt

@@ -25,6 +25,10 @@ add_executable(ff7_battle_scene_dumper
   ${SOURCE_FILES}
 )
 
+if (APPLE)
+target_link_libraries(ff7_battle_scene_dumper "-framework CoreFoundation -framework Cocoa -framework IOKit")
+endif()
+
 if(WIN32)
   set_target_properties(ff7_battle_scene_dumper PROPERTIES WIN32_EXECUTABLE ON)
   if (MSVC)

+ 4 - 0
utilities/ffvii_field_dat_dumper/CMakeLists.txt

@@ -22,6 +22,10 @@ add_executable(ff7_field_dat_dumper
   ${SOURCE_FILES}
 )
 
+if (APPLE)
+target_link_libraries(ff7_field_dat_dumper "-framework CoreFoundation -framework Cocoa -framework IOKit")
+endif()
+
 if(WIN32)
   set_target_properties(ff7_field_dat_dumper PROPERTIES WIN32_EXECUTABLE ON)
   if (MSVC)

+ 4 - 0
utilities/ffvii_field_model_exporter/CMakeLists.txt

@@ -36,6 +36,10 @@ add_executable(ff7_field_model_exporter
   ${SOURCE_FILES}
 )
 
+if (APPLE)
+target_link_libraries(ff7_field_model_exporter "-framework CoreFoundation -framework Cocoa -framework IOKit")
+endif()
+
 if(WIN32)
   set_target_properties(ff7_field_model_exporter PROPERTIES WIN32_EXECUTABLE ON)
   if (MSVC)

+ 4 - 0
utilities/ffvii_field_model_exporter_pc/CMakeLists.txt

@@ -20,6 +20,10 @@ add_executable(ff7_field_model_exporter_pc
   ${SOURCE_FILES}
 )
 
+if (APPLE)
+target_link_libraries(ff7_field_model_exporter_pc "-framework CoreFoundation -framework Cocoa -framework IOKit")
+endif()
+
 if(WIN32)
   set_target_properties(ff7_field_model_exporter_pc PROPERTIES WIN32_EXECUTABLE ON)
   if (MSVC)

+ 4 - 0
utilities/ffvii_sound_dumper/CMakeLists.txt

@@ -27,6 +27,10 @@ add_executable(ff7_sound_dumper
   ${SOURCE_FILES}
 )
 
+if (APPLE)
+target_link_libraries(ff7_sound_dumper "-framework CoreFoundation -framework Cocoa -framework IOKit")
+endif()
+
 if(WIN32)
   set_target_properties(ff7_sound_dumper PROPERTIES WIN32_EXECUTABLE ON)
   if (MSVC)

+ 4 - 0
utilities/xeno_model_exporter/CMakeLists.txt

@@ -32,6 +32,10 @@ add_executable(xeno_model_exporter
   ${SOURCE_FILES}
 )
 
+if (APPLE)
+target_link_libraries(xeno_model_exporter "-framework CoreFoundation -framework Cocoa -framework IOKit")
+endif()
+
 if(WIN32)
   set_target_properties(xeno_model_exporter PROPERTIES WIN32_EXECUTABLE ON)
   if (MSVC)

+ 4 - 0
utilities/xeno_sound_dumper/CMakeLists.txt

@@ -27,6 +27,10 @@ add_executable(xeno_sound_dumper
   ${SOURCE_FILES}
 )
 
+if (APPLE)
+target_link_libraries(xeno_sound_dumper "-framework CoreFoundation -framework Cocoa -framework IOKit")
+endif()
+
 if(WIN32)
   set_target_properties(xeno_sound_dumper PROPERTIES WIN32_EXECUTABLE ON)
   if (MSVC)

+ 4 - 0
utilities/xeno_walkmesh_exporter/CMakeLists.txt

@@ -84,6 +84,10 @@ add_executable(xeno_walkmesh_exporter
   ${SOURCE_FILES}
 )
 
+if (APPLE)
+target_link_libraries(xeno_walkmesh_exporter "-framework CoreFoundation -framework Cocoa -framework IOKit")
+endif()
+
 if(WIN32)
   set_target_properties(xeno_walkmesh_exporter PROPERTIES WIN32_EXECUTABLE ON)
   if (MSVC)