edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

osx -> macos

Browse source
This commit is contained in:
def 2021-12-04 13:26:12 +01:00
parent 2524905d74
commit 3f637ae0f7
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yaml vendored
View file

@ -35,7 +35,7 @@ jobs:
- os: macOS-latest - os: macOS-latest
cmake-args: -G "Unix Makefiles" cmake-args: -G "Unix Makefiles"
build-args: --parallel build-args: --parallel
package-file: DDNet-*-osx.dmg package-file: DDNet-*-macos.dmg
fancy: false fancy: false
env: env:
CFLAGS: -Wdeclaration-after-statement -Werror CFLAGS: -Wdeclaration-after-statement -Werror

2
CMakeLists.txt
View file

@ -2428,7 +2428,7 @@ if(TARGET_OS AND TARGET_BITS)
endif() endif()
set(CPACK_SYSTEM_NAME "linux_${ARCHITECTURE}") set(CPACK_SYSTEM_NAME "linux_${ARCHITECTURE}")
elseif(TARGET_OS STREQUAL "mac") elseif(TARGET_OS STREQUAL "mac")
set(CPACK_SYSTEM_NAME "osx") set(CPACK_SYSTEM_NAME "macos")
set(CPACK_GENERATOR DMG) set(CPACK_GENERATOR DMG)
endif() endif()
endif() endif()

4
Dockerfile
View file

@ -41,8 +41,8 @@ RUN printf '#!/bin/bash\n \
cd /build/win32\n \ cd /build/win32\n \
pwd\n \ pwd\n \
cmake -DCMAKE_TOOLCHAIN_FILE=/ddnet/cmake/toolchains/mingw32.toolchain /ddnet && make\n \ cmake -DCMAKE_TOOLCHAIN_FILE=/ddnet/cmake/toolchains/mingw32.toolchain /ddnet && make\n \
mkdir /build/osx\n \ mkdir /build/macos\n \
cd /build/osx\n \ cd /build/macos\n \
pwd\n \ pwd\n \
cmake -DCMAKE_TOOLCHAIN_FILE=/ddnet/cmake/toolchains/darwin.toolchain -DCMAKE_OSX_SYSROOT=/osxcross/target/SDK/MacOSX10.11.sdk/ /ddnet && make' \ cmake -DCMAKE_TOOLCHAIN_FILE=/ddnet/cmake/toolchains/darwin.toolchain -DCMAKE_OSX_SYSROOT=/osxcross/target/SDK/MacOSX10.11.sdk/ /ddnet && make' \
>> build-all.sh >> build-all.sh