Commit be6b908c authored by nanahira's avatar nanahira

fix

parent c09410e2
Pipeline #34097 failed
...@@ -53,9 +53,10 @@ mat_macos: ...@@ -53,9 +53,10 @@ mat_macos:
PREMAKE_OS: linux PREMAKE_OS: linux
BUILD_TYPE: x64 BUILD_TYPE: x64
DIST_PATH: build/bin/x64/Release DIST_PATH: build/bin/x64/Release
PREMAKE5_PATH: premake5
script: script:
- ln -sf premake/dll.lua . - ln -sf premake/dll.lua .
- premake5 gmake --file=dll.lua --os=$PREMAKE_OS - $PREMAKE5_PATH gmake --file=dll.lua --os=$PREMAKE_OS
- cd build - cd build
- make config=release_${BUILD_TYPE} -j$(nproc) - make config=release_${BUILD_TYPE} -j$(nproc)
- cd .. - cd ..
...@@ -91,6 +92,7 @@ build_wasm: ...@@ -91,6 +92,7 @@ build_wasm:
stage: build stage: build
dependencies: dependencies:
- mat_windows - mat_windows
- lua
tags: tags:
- vs - vs
before_script: before_script:
...@@ -117,20 +119,23 @@ build_windows_x64: ...@@ -117,20 +119,23 @@ build_windows_x64:
- mkdir dist\x64 - mkdir dist\x64
- copy build\bin\x64\Release\ocgcore.dll dist\x64\ocgcore.dll - copy build\bin\x64\Release\ocgcore.dll dist\x64\ocgcore.dll
build_macos_x64: .build_macos_arch:
extends: .build_unix extends: .build_unix
tags: tags:
- macos - macos
variables: variables:
PREMAKE_OS: macosx PREMAKE_OS: macosx
BUILD_TYPE: x64 BUILD_TYPE: x64
PREMAKE5_PATH: ./premake5
build_macos_x64:
extends: .build_macos_arch
build_macos_m1: build_macos_m1:
extends: .build_unix extends: .build_macos_x64
tags: tags:
- macos-m1 - macos-m1
variables: variables:
PREMAKE_OS: macosx
BUILD_TYPE: arm64 BUILD_TYPE: arm64
MAC_ARM: '1' MAC_ARM: '1'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment