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

Merge pull request #10706 from andyque/fix-jenkins-compile-issue 

fix v3 win32 build issue
This commit is contained in:
Huabing.Xu 2015-03-03 21:14:56 +08:00
parent 885a740a76 2e2fb122e6
commit ccded2cb1a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,7 +267,10 @@ 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.vc2013.sln" /Build "Debug|Win32"', shell=True)
build_vs_project_name = 'cocos2d-win32.vc2013.sln'
if(branch == 'v3'):
build_vs_project_name = 'cocos2d-win32.vc2012.sln'
ret = subprocess.call('"%VS120COMNTOOLS%..\IDE\devenv.com" "build\"' + build_vs_project_name + ' /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'):