diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 27c84e9ed..5862fdb20 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -35,7 +35,7 @@ jobs: - os: macOS-latest cmake-args: -G "Unix Makefiles" build-args: --parallel - package-file: DDNet-*-osx.dmg + package-file: DDNet-*-macos.dmg fancy: false env: CFLAGS: -Wdeclaration-after-statement -Werror diff --git a/CMakeLists.txt b/CMakeLists.txt index 027a53418..ab9b1bba7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2428,7 +2428,7 @@ if(TARGET_OS AND TARGET_BITS) endif() set(CPACK_SYSTEM_NAME "linux_${ARCHITECTURE}") elseif(TARGET_OS STREQUAL "mac") - set(CPACK_SYSTEM_NAME "osx") + set(CPACK_SYSTEM_NAME "macos") set(CPACK_GENERATOR DMG) endif() endif() diff --git a/Dockerfile b/Dockerfile index ecc3b06d5..3957a4b0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,8 +41,8 @@ RUN printf '#!/bin/bash\n \ cd /build/win32\n \ pwd\n \ cmake -DCMAKE_TOOLCHAIN_FILE=/ddnet/cmake/toolchains/mingw32.toolchain /ddnet && make\n \ - mkdir /build/osx\n \ - cd /build/osx\n \ + mkdir /build/macos\n \ + cd /build/macos\n \ pwd\n \ cmake -DCMAKE_TOOLCHAIN_FILE=/ddnet/cmake/toolchains/darwin.toolchain -DCMAKE_OSX_SYSROOT=/osxcross/target/SDK/MacOSX10.11.sdk/ /ddnet && make' \ >> build-all.sh