Browse Source

Fix for running player from XCode

Josh Engebretson 10 years ago
parent
commit
2a5f273f5d
2 changed files with 13 additions and 0 deletions
  1. 6 0
      CMake/Modules/AtomicMac.cmake
  2. 7 0
      Source/ToolCore/ToolEnvironment.cpp

+ 6 - 0
CMake/Modules/AtomicMac.cmake

@@ -6,6 +6,12 @@ set (JAVASCRIPT_BINDINGS_PLATFORM "MACOSX")
 
 
 add_definitions(-DATOMIC_PLATFORM_OSX -DATOMIC_OPENGL -DKNET_UNIX)
 add_definitions(-DATOMIC_PLATFORM_OSX -DATOMIC_OPENGL -DKNET_UNIX)
 
 
+if (CMAKE_GENERATOR STREQUAL "Xcode")
+
+add_definitions(-DATOMIC_XCODE)
+
+endif()
+
 list (APPEND ATOMIC_LINK_LIBRARIES GLEW)
 list (APPEND ATOMIC_LINK_LIBRARIES GLEW)
 
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -std=gnu++0x")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -std=gnu++0x")

+ 7 - 0
Source/ToolCore/ToolEnvironment.cpp

@@ -138,8 +138,15 @@ void ToolEnvironment::SetRootBuildDir(const String& buildDir, bool setBinaryPath
         editorBinary_ = rootBuildDir_ + "Source/AtomicEditor/Release/AtomicEditor.exe";
         editorBinary_ = rootBuildDir_ + "Source/AtomicEditor/Release/AtomicEditor.exe";
 #endif
 #endif
 #elif ATOMIC_PLATFORM_OSX
 #elif ATOMIC_PLATFORM_OSX
+
+#ifdef ATOMIC_XCODE
+        playerBinary_ = rootBuildDir_ + "Source/AtomicPlayer/" + CMAKE_INTDIR + "/AtomicPlayer.app/Contents/MacOS/AtomicPlayer";
+        editorBinary_ = rootBuildDir_ + "Source/AtomicEditor/" + CMAKE_INTDIR + "/AtomicEditor.app/Contents/MacOS/AtomicEditor";
+#else
         playerBinary_ = rootBuildDir_ + "Source/AtomicPlayer/AtomicPlayer.app/Contents/MacOS/AtomicPlayer";
         playerBinary_ = rootBuildDir_ + "Source/AtomicPlayer/AtomicPlayer.app/Contents/MacOS/AtomicPlayer";
         editorBinary_ = rootBuildDir_ + "Source/AtomicEditor/AtomicEditor.app/Contents/MacOS/AtomicEditor";
         editorBinary_ = rootBuildDir_ + "Source/AtomicEditor/AtomicEditor.app/Contents/MacOS/AtomicEditor";
+#endif
+        
 #endif
 #endif
     }
     }