From 942ceccd9944d9327f2cf878214d483c43a9b62d Mon Sep 17 00:00:00 2001 From: andyque Date: Wed, 4 Mar 2015 14:12:11 +0800 Subject: [PATCH] fix android and win32 compile error --- tests/cpp-tests/proj.android/jni/Android.mk | 1 - tools/jenkins-scripts/pull-request-builder.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/cpp-tests/proj.android/jni/Android.mk b/tests/cpp-tests/proj.android/jni/Android.mk index 1beecb957a..bc30532323 100644 --- a/tests/cpp-tests/proj.android/jni/Android.mk +++ b/tests/cpp-tests/proj.android/jni/Android.mk @@ -7,7 +7,6 @@ LOCAL_MODULE := cpp_tests_shared LOCAL_MODULE_FILENAME := libcpp_tests LOCAL_SRC_FILES := main.cpp \ -../../Classes/CocosStudio3DTest/CocosStudio3DTest.cpp \ ../../Classes/AppDelegate.cpp \ ../../Classes/BaseTest.cpp \ ../../Classes/controller.cpp \ diff --git a/tools/jenkins-scripts/pull-request-builder.py b/tools/jenkins-scripts/pull-request-builder.py index 4c8ed52b22..0c3a02cda4 100755 --- a/tools/jenkins-scripts/pull-request-builder.py +++ b/tools/jenkins-scripts/pull-request-builder.py @@ -267,7 +267,7 @@ def main(): close_db(db) 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'): 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'):