Skip to content

Y
ygopro
Commit acb6994f authored by nanahira's avatar nanahira
Browse files
Options

Revert "need a native premake5" 

This reverts commit 5d907e10.
parent 53c9f9f3
Pipeline #15271 passed with stages
        in 5 minutes and 21 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 6 additions and 2 deletions
        .ci/exec-macos-platform.sh
        View file @ acb6994f
        ...@@ -11,7 +11,7 @@ export IRRLICHT_LIB_DIR=$PWD/irrlicht ...@@ -11,7 +11,7 @@ export IRRLICHT_LIB_DIR=$PWD/irrlicht
        ./.ci/libevent-prebuild.sh ./.ci/libevent-prebuild.sh
        premake5 gmake --cc=clang --build-freetype --build-sqlite --no-use-irrklang ./premake5 gmake --cc=clang --build-freetype --build-sqlite --no-use-irrklang
        cd build cd build
        make config=release -j4 make config=release -j4
        ......
        .gitlab-ci.yml
        View file @ acb6994f
        ...@@ -91,6 +91,7 @@ mat_macos: ...@@ -91,6 +91,7 @@ mat_macos:
        - linux - linux
        script: script:
        - apt update; apt -y install wget tar - apt update; apt -y install wget tar
        - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta1-macosx.tar.gz | tar zfx -
        # - wget -O - https://cdn01.moecube.com/ygopro-build-materials/libirrklang-patched-dylib.tar.gz | tar zfx - # - wget -O - https://cdn01.moecube.com/ygopro-build-materials/libirrklang-patched-dylib.tar.gz | tar zfx -
        - mkdir irrlicht - mkdir irrlicht
        - cd irrlicht - cd irrlicht
        ...@@ -98,6 +99,7 @@ mat_macos: ...@@ -98,6 +99,7 @@ mat_macos:
        - cd .. - cd ..
        artifacts: artifacts:
        paths: paths:
        - premake5
        - irrlicht - irrlicht
        mat_windows: mat_windows:
        ...@@ -200,6 +202,8 @@ exec_macos_platform_m1: ...@@ -200,6 +202,8 @@ exec_macos_platform_m1:
        extends: .exec_macos_platform extends: .exec_macos_platform
        tags: tags:
        - macos-m1 - macos-m1
        variables:
        MAC_ARM: 1
        exec_macos: exec_macos:
        stage: combine stage: combine
        ......
        premake5.lua
        View file @ acb6994f
        ...@@ -202,7 +202,7 @@ workspace "YGOPro" ...@@ -202,7 +202,7 @@ workspace "YGOPro"
        filter { "configurations:Release", "not action:vs*" } filter { "configurations:Release", "not action:vs*" }
        symbols "On" symbols "On"
        defines "NDEBUG" defines "NDEBUG"
        if not ON_MAC_ARM then if not MAC_ARM then
        buildoptions "-march=native" buildoptions "-march=native"
        end end
        ......
        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