Skip to content

Commit 784d7b7

Browse files
authored
Merge pull request #3299 from softins/debug-and-release
Add debug_and_release to use separate build dirs
2 parents 34e4d6e + feb33b4 commit 784d7b7

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ libs/NSIS/nsProcess.dll
3030
windows/NSIS
3131
libs/NSIS/nsProcess/Release/
3232
debug/
33+
debug-*/
3334
release/
35+
release-*/
3436
build/
3537
deploy/
3638
build-gui/
@@ -48,6 +50,7 @@ linux/jamulus.desktop
4850
linux/jamulus-server.desktop
4951
.xcode
5052
Debug-iphoneos/
53+
Release-iphoneos/
5154
Jamulus.xcodeproj
5255
jamulus_plugin_import.cpp
5356
.github_release_changelog.md

Jamulus.pro

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ contains(VERSION, .*dev.*) {
2929
CONFIG += qt \
3030
thread \
3131
lrelease \
32-
embed_translations
32+
embed_translations \
33+
debug_and_release
3334

3435
QT += network \
3536
xml \

mac/deploy_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ build_app() {
5555
"QMAKE_APPLE_DEVICE_ARCHS=${target_arch}" "QT_ARCH=${target_arch}" \
5656
"${@:2}"
5757
make -f "${build_path}/Makefile" -C "${build_path}" -j "${job_count}"
58-
target_name=$(sed -nE 's/^QMAKE_TARGET *= *(.*)$/\1/p' "${build_path}/Makefile")
58+
target_name=$(sed -nE 's/^QMAKE_TARGET *= *(.*)$/\1/p' "${build_path}/Makefile.Release")
5959
if [[ ${#target_archs_array[@]} -gt 1 ]]; then
6060
# When building for multiple architectures, move the binary to a safe place to avoid overwriting/cleaning by the other passes.
6161
mv "${build_path}/${target_name}.app/Contents/MacOS/${target_name}" "${deploy_path}/${target_name}.arch_${target_arch}"

0 commit comments

Comments
 (0)