mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-19 17:14:18 +00:00
osx -> macos
This commit is contained in:
parent
2524905d74
commit
3f637ae0f7
2
.github/workflows/build.yaml
vendored
2
.github/workflows/build.yaml
vendored
|
@ -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
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue