Procházet zdrojové kódy

Fix Android build with LuaJIT enabled on Mac OS X host system. Take 2.

Yao Wei Tjong 姚伟忠 před 11 roky
rodič
revize
cf77a15e6f

+ 1 - 3
Source/ThirdParty/toluapp/src/bin/CMakeLists.txt

@@ -56,9 +56,7 @@ endif ()
 set (TARGET_NAME tolua++)
 
 # Define source files
-file (GLOB CPP_FILES *.c)
-file (GLOB H_FILES *.h)
-set (SOURCE_FILES ${CPP_FILES} ${H_FILES})
+define_source_files (GLOB_CPP_PATTERNS *.c)
 
 # Define dependency libs
 set (LIBS toluapp Lua${JIT})

+ 1 - 1
Source/Urho3D/CMakeLists.txt

@@ -45,7 +45,7 @@ if (URHO3D_LUA)
         endif ()
         ExternalProject_Add(tolua++
             SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/ThirdParty/toluapp/src/bin
-            CMAKE_ARGS -DJIT=${JIT} -DDEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool -DBAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} ${OSX_HOST}
+            CMAKE_ARGS -DURHO3D_LUAJIT=${URHO3D_LUAJIT} -DDEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool -DBAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} ${OSX_HOST}
         )
     else ()
         # Otherwise, build it internally as per normal