Enable mac build for ci

This commit is contained in:
halx99 2020-09-04 16:47:32 +08:00
parent 9b2665e9ce
commit 715858a0e0
3 changed files with 8 additions and 9 deletions

View File

@ -9,11 +9,11 @@ matrix:
# sudo: required # sudo: required
# language: cpp # language: cpp
# mac_cmake # mac_cmake
# - os: osx - os: osx
# env: BUILD_TARGET=mac_cmake env: BUILD_TARGET=mac_cmake
# language: cpp language: cpp
# osx_image: xcode10.3 osx_image: xcode11
# sudo: required sudo: required
# iOS_cmake # iOS_cmake
- os: osx - os: osx
env: BUILD_TARGET=ios_cmake env: BUILD_TARGET=ios_cmake

View File

@ -108,7 +108,7 @@ If ($env:build_type -eq "android_cpp_tests") {
# if ($lastexitcode -ne 0) {throw} # mkdir return no-zero # if ($lastexitcode -ne 0) {throw} # mkdir return no-zero
Push-Location $env:APPVEYOR_BUILD_FOLDER\win32-build Push-Location $env:APPVEYOR_BUILD_FOLDER\win32-build
& cmake -A Win32 -DCMAKE_BUILD_TYPE=Release .. & cmake -A Win32 -DCMAKE_BUILD_TYPE=Release .. -DBUILD_EXTENSION_IMGUI=ON
if ($lastexitcode -ne 0) {throw} if ($lastexitcode -ne 0) {throw}
& cmake --build . --config Release --target cpp-tests & cmake --build . --config Release --target cpp-tests

View File

@ -49,9 +49,8 @@ function build_mac_cmake()
# cd $COCOS2DX_ROOT/cocos_new_test # cd $COCOS2DX_ROOT/cocos_new_test
cd $COCOS2DX_ROOT cd $COCOS2DX_ROOT
mkdir -p build mkdir -p build
cd build cmake -S . -B build -GXcode -DBUILD_EXTENSION_IMGUI=ON
cmake .. -GXcode cmake --build build --config Release -- -quiet
cmake --build . --config Release -- -quiet
#xcodebuild -project Cocos2d-x.xcodeproj -alltargets -jobs $NUM_OF_CORES build | xcpretty #xcodebuild -project Cocos2d-x.xcodeproj -alltargets -jobs $NUM_OF_CORES build | xcpretty
##the following commands must not be removed ##the following commands must not be removed
#xcodebuild -project Cocos2d-x.xcodeproj -alltargets -jobs $NUM_OF_CORES build #xcodebuild -project Cocos2d-x.xcodeproj -alltargets -jobs $NUM_OF_CORES build