Merge pull request #12772 from zilongshanren/v3.7-release

[ci skip]fix js template run error on linux.
This commit is contained in:
子龙山人 2015-07-10 10:20:31 +08:00
commit 0468cf7ba9
1 changed files with 4 additions and 0 deletions

View File

@ -257,6 +257,9 @@ message(STATUS "Flatbuffers include dirs: ${FLATBUFFERS_INCLUDE_DIRS}")
add_subdirectory(frameworks/cocos2d-x/external/xxhash) add_subdirectory(frameworks/cocos2d-x/external/xxhash)
include_directories(frameworks/cocos2d-x/external/xxhash) include_directories(frameworks/cocos2d-x/external/xxhash)
#buid recast
add_subdirectory(frameworks/cocos2d-x/external/recast)
set(GAME_SRC set(GAME_SRC
frameworks/runtime-src/proj.linux/main.cpp frameworks/runtime-src/proj.linux/main.cpp
frameworks/runtime-src/Classes/AppDelegate.cpp frameworks/runtime-src/Classes/AppDelegate.cpp
@ -277,6 +280,7 @@ add_executable(${APP_NAME}
target_link_libraries(${APP_NAME} target_link_libraries(${APP_NAME}
jscocos2d jscocos2d
cocos2d cocos2d
recast
) )
set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin") set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin")