ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support Debug builds for mac. 

Allow codesigning frameworks to fail.

Use ninja to build project in the builder instead of make.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2021-10-31 17:10:22 -07:00
parent 414cacbf28
commit b6837cea05
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wx/CMakeLists.txt
View File

@ -1223,14 +1223,18 @@ if(APPLE AND (UPSTREAM_RELEASE OR ENABLE_ONLINEUPDATES))
add_custom_command(
TARGET visualboyadvance-m
POST_BUILD
COMMAND codesign --sign "Developer ID Application" --force ${framework}
VERBATIM COMMAND sh -c "codesign --sign 'Developer ID Application' --force ${framework} || :"
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
endforeach()
endif()
if(UPSTREAM_RELEASE)
set(appzip visualboyadvance-m-Mac-${ARCH_NAME}${ZIP_SUFFIX}.zip)
if(CMAKE_BUILD_TYPE MATCHES Debug)
set(appzip visualboyadvance-m-Mac-${ARCH_NAME}-debug${ZIP_SUFFIX}.zip)
else()
set(appzip visualboyadvance-m-Mac-${ARCH_NAME}${ZIP_SUFFIX}.zip)
endif()
add_custom_command(
TARGET visualboyadvance-m

17
tools/builder/core.sh
View File

@ -2671,10 +2671,21 @@ build_project() {
lto=OFF
fi
echo_eval_run cmake "'$CHECKOUT'" $CMAKE_REQUIRED_ARGS -DVBAM_STATIC=ON -DENABLE_LTO=${lto} -DUPSTREAM_RELEASE=TRUE $CMAKE_ARGS $PROJECT_ARGS $@
echo_run make -j$NUM_CPUS VERBOSE=1
# Release build.
puts "${NL}Building Release...${NL}${NL}"
mkdir release && cd release
echo_eval_run cmake "'$CHECKOUT'" $CMAKE_REQUIRED_ARGS -DVBAM_STATIC=ON -DENABLE_LTO=${lto} -DUPSTREAM_RELEASE=TRUE $CMAKE_ARGS $PROJECT_ARGS -G Ninja $@
echo_run ninja -j$NUM_CPUS -v
dist_post_build project
cd ..
# Debug build.
puts "${NL}Building Debug...${NL}${NL}"
mkdir debug && cd debug
echo_eval_run cmake "'$CHECKOUT'" $CMAKE_REQUIRED_ARGS -DVBAM_STATIC=ON -DENABLE_LTO=${lto} -DUPSTREAM_RELEASE=TRUE $CMAKE_ARGS $PROJECT_ARGS -DCMAKE_BUILD_TYPE=Debug -G Ninja $@
echo_run ninja -j$NUM_CPUS -v
dist_post_build project
cd ..
puts "${NL}Build Successful!!!${NL}${NL}Build results can be found in: $BUILD_ROOT/project${NL}${NL}"
}