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

Merge pull request #10719 from andyque/fix-win32-jenkin-issue 

fix android and win32 compile error
This commit is contained in:
Huabing.Xu 2015-03-04 14:14:40 +08:00
parent 6805d24ba3 942ceccd99
commit 714cb3db14
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/cpp-tests/proj.android/jni/Android.mk
View File

@ -7,7 +7,6 @@ LOCAL_MODULE := cpp_tests_shared
LOCAL_MODULE_FILENAME := libcpp_tests LOCAL_MODULE_FILENAME := libcpp_tests
LOCAL_SRC_FILES := main.cpp \ LOCAL_SRC_FILES := main.cpp \
../../Classes/CocosStudio3DTest/CocosStudio3DTest.cpp \
../../Classes/AppDelegate.cpp \ ../../Classes/AppDelegate.cpp \
../../Classes/BaseTest.cpp \ ../../Classes/BaseTest.cpp \
../../Classes/controller.cpp \ ../../Classes/controller.cpp \

2
tools/jenkins-scripts/pull-request-builder.py
View File

@ -267,7 +267,7 @@ def main():
close_db(db) close_db(db)
elif(node_name == 'win32' or node_name == 'win32_win7' or node_name == 'win32_bak'): elif(node_name == 'win32' or node_name == 'win32_win7' or node_name == 'win32_bak'):
ret = subprocess.call('"%VS120COMNTOOLS%..\IDE\devenv.com" "build\cocos2d-win32.vc2012" /Build "Debug|Win32"', shell=True) ret = subprocess.call('"%VS120COMNTOOLS%..\IDE\devenv.com" "build\cocos2d-win32.vc2012.sln" /Build "Debug|Win32"', shell=True)
elif(node_name == 'windows-universal' or node_name == 'windows-universal_bak'): elif(node_name == 'windows-universal' or node_name == 'windows-universal_bak'):
ret = subprocess.call('"%VS120COMNTOOLS%..\IDE\devenv.com" "build\cocos2d-win8.1-universal.sln" /Build "Debug|Win32"', shell=True) ret = subprocess.call('"%VS120COMNTOOLS%..\IDE\devenv.com" "build\cocos2d-win8.1-universal.sln" /Build "Debug|Win32"', shell=True)
elif(node_name == 'ios_mac' or node_name == 'ios' or node_name == 'ios_bak'): elif(node_name == 'ios_mac' or node_name == 'ios' or node_name == 'ios_bak'):