Merge pull request #3299 from softins/debug-and-release

Add debug_and_release to use separate build dirs
jamulussoftware · Jun 26, 2024 · 784d7b7 · 784d7b7
2 parents 34e4d6e + feb33b4
commit 784d7b7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,7 +30,9 @@ libs/NSIS/nsProcess.dll
 windows/NSIS
 libs/NSIS/nsProcess/Release/
 debug/
+debug-*/
 release/
+release-*/
 build/
 deploy/
 build-gui/
@@ -48,6 +50,7 @@ linux/jamulus.desktop
 linux/jamulus-server.desktop
 .xcode
 Debug-iphoneos/
+Release-iphoneos/
 Jamulus.xcodeproj
 jamulus_plugin_import.cpp
 .github_release_changelog.md

diff --git a/Jamulus.pro b/Jamulus.pro
@@ -29,7 +29,8 @@ contains(VERSION, .*dev.*) {
 CONFIG += qt \
     thread \
     lrelease \
-    embed_translations
+    embed_translations \
+    debug_and_release
 
 QT += network \
     xml \

diff --git a/mac/deploy_mac.sh b/mac/deploy_mac.sh
@@ -55,7 +55,7 @@ build_app() {
             "QMAKE_APPLE_DEVICE_ARCHS=${target_arch}" "QT_ARCH=${target_arch}" \
             "${@:2}"
         make -f "${build_path}/Makefile" -C "${build_path}" -j "${job_count}"
-        target_name=$(sed -nE 's/^QMAKE_TARGET *= *(.*)$/\1/p' "${build_path}/Makefile")
+        target_name=$(sed -nE 's/^QMAKE_TARGET *= *(.*)$/\1/p' "${build_path}/Makefile.Release")
         if [[ ${#target_archs_array[@]} -gt 1 ]]; then
             # When building for multiple architectures, move the binary to a safe place to avoid overwriting/cleaning by the other passes.
             mv "${build_path}/${target_name}.app/Contents/MacOS/${target_name}" "${deploy_path}/${target_name}.arch_${target_arch}"