diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0bad590aa..a2659d6b9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -148,7 +148,7 @@ jobs: run: | make ${{ matrix.rule }} -j$(sysctl -n hw.logicalcpu) ARCH=x86_64 CC=${{ matrix.cc }} DESTDIR=bin INSTALL=ginstall STRIP=echo QUAKE3=1 make ${{ matrix.rule }} -j$(sysctl -n hw.logicalcpu) ARCH=arm64 CC=${{ matrix.cc }} DESTDIR=bin INSTALL=ginstall STRIP=echo QUAKE3=1 - OBJROOT=bin QUAKE3=1 ./make-macosx-app.sh release + QUAKE3=1 ./make-macosx-app.sh release hdiutil create -format UDZO -srcfolder bin/release-darwin-universal2/OmegA.app bin/OmegA.dmg - uses: actions/upload-artifact@v4 diff --git a/make-macosx-app.sh b/make-macosx-app.sh index e865537f0..da3e8c54a 100755 --- a/make-macosx-app.sh +++ b/make-macosx-app.sh @@ -166,7 +166,7 @@ ICNSDIR="code/unix" ICNS="quake3_flat.icns" PKGINFO="APPLOMG" -OBJROOT="${OBJROOT:-build}" +OBJROOT="build" #BUILT_PRODUCTS_DIR="${OBJROOT}/${TARGET_NAME}-darwin-${CURRENT_ARCH}" if [ "$QUAKE3" == "1" ]; then PRODUCT_NAME="q3-omega"