Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update the CMakeLists & the remote url of submodule js-bindings.

This commit is contained in:
zhangbin 2015-04-23 14:23:19 +08:00
parent b68ccea6f8
commit dcca32bd82
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -12,7 +12,7 @@
url = git://github.com/dumganhar/ccs-res.git
[submodule "cocos/scripting/js-bindings"]
path = cocos/scripting/js-bindings
url = git@github.com:natural-law/cocos2d-jsb.git
url = git://github.com/cocos2d/js-bindings.git
[submodule "web"]
path = web
url = git@github.com:cocos2d/cocos2d-html5.git
url = git://github.com/cocos2d/cocos2d-html5.git

2
CMakeLists.txt
View File

@ -59,7 +59,7 @@ set(BUILD_CPP_TESTS_DEFAULT ON)
set(BUILD_LUA_LIBS_DEFAULT ON)
set(BUILD_LUA_TESTS_DEFAULT ON)
set(BUILD_JS_LIBS_DEFAULT ON)
set(BUILD_JS_TESTS_DEFAULT OFF)
set(BUILD_JS_TESTS_DEFAULT ON)
# TODO: fix test samples for MSVC
if(MSVC)
set(BUILD_CPP_TESTS_DEFAULT OFF)

2
cocos/scripting/js-bindings

@ -1 +1 @@
Subproject commit 0913343908219bc26ca86ad981e5cbac6215b599
Subproject commit 9b5067b88161e4e040330fb58f19d6229c3a442d

3
templates/cpp-template-default/CMakeLists.txt
View File

@ -35,7 +35,8 @@ include(CocosBuildHelpers)
# libcocos2d
set(BUILD_CPP_TESTS OFF CACHE BOOL "turn off build cpp-tests")
set(BUILD_LUA_LIBS OFF CACHE BOOL "turn off build lua-tests")
set(BUILD_LUA_LIBS OFF CACHE BOOL "turn off build lua related targets")
set(BUILD_JS_LIBS OFF CACHE BOOL "turn off build js related targets")
add_subdirectory(${COCOS2D_ROOT})
# Some macro definitions

1
templates/lua-template-default/frameworks/CMakeLists.txt
View File

@ -45,6 +45,7 @@ endif(DEBUG_MODE)
# libcocos2d
set(BUILD_CPP_TESTS OFF CACHE BOOL "turn off build cpp-tests")
set(BUILD_LUA_TESTS OFF CACHE BOOL "turn off build lua-tests")
set(BUILD_JS_LIBS OFF CACHE BOOL "turn off build js releated targets")
add_subdirectory(${COCOS2D_ROOT})