diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index fbceb63e48..2ee8484e39 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -796,6 +796,7 @@ 52B47A351A53A43A004E4C60 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52B47A331A534B2B004E4C60 /* Security.framework */; }; 59620E8F1921E5CF002021B6 /* Bug-Child.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59620E8D1921E5CF002021B6 /* Bug-Child.cpp */; }; 59620E901921E5CF002021B6 /* Bug-Child.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59620E8D1921E5CF002021B6 /* Bug-Child.cpp */; }; + 59E170151AB42EB10007F2BF /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 826294421AAF071500CB7CF7 /* Security.framework */; }; 5EBEECB01995247000429821 /* DrawNode3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EBEECAE1995247000429821 /* DrawNode3D.cpp */; }; 5EBEECB11995247000429821 /* DrawNode3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EBEECAE1995247000429821 /* DrawNode3D.cpp */; }; 826294431AAF071500CB7CF7 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 826294421AAF071500CB7CF7 /* Security.framework */; }; @@ -1864,6 +1865,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 59E170151AB42EB10007F2BF /* Security.framework in Frameworks */, 15EFA273198B265A000C57D3 /* libluacocos2d Mac.a in Frameworks */, 1ABCA2C318CD92420087CE3A /* libcocos2d Mac.a in Frameworks */, 1ABCA36118CD9AC00087CE3A /* libz.dylib in Frameworks */, diff --git a/tools/jenkins-scripts/slave-scripts/mac-build.sh b/tools/jenkins-scripts/slave-scripts/mac-build.sh index 5cf95d3c11..292bd3b1ef 100755 --- a/tools/jenkins-scripts/slave-scripts/mac-build.sh +++ b/tools/jenkins-scripts/slave-scripts/mac-build.sh @@ -1,8 +1,20 @@ #put xctool.sh into your PATH + +####### +# Cmake build +####### +# DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +# COCOS2DX_ROOT="$DIR"/../../.. +# cd ${COCOS2DX_ROOT} +# mkdir mac-build +# cd mac-build +# cmake .. +# make -j4 + +####### +# xcode build +####### DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" COCOS2DX_ROOT="$DIR"/../../.. -cd ${COCOS2DX_ROOT} -mkdir mac-build -cd mac-build -cmake .. -make -j4 +xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_tests.xcodeproj -scheme "build all tests Mac" clean | xcpretty +xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_tests.xcodeproj -scheme "build all tests Mac" build | xcpretty