Skip to content

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

new premake

parent 294fa948
Pipeline #7712 failed with stages
        in 5 minutes and 51 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 8 additions and 15 deletions
        .gitlab-ci.yml
        View file @ f8496c5c
        ...@@ -52,13 +52,13 @@ mat_linux: ...@@ -52,13 +52,13 @@ mat_linux:
        - linux - linux
        script: script:
        - apt update; apt -y install git wget tar - apt update; apt -y install git wget tar
        - git clone --depth=1 https://code.mycard.moe/mycard/irrlicht irrlicht_linux - git clone --depth=1 https://code.mycard.moe/mycard/irrlicht-new irrlicht
        - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-alpha14-linux.tar.gz | tar zfx - - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-alpha14-linux.tar.gz | tar zfx -
        - env PROCESSOR_COUNT=$(nproc) ./.ci/libevent-prebuild.sh - env PROCESSOR_COUNT=$(nproc) ./.ci/libevent-prebuild.sh
        artifacts: artifacts:
        paths: paths:
        - premake5 - premake5
        - irrlicht_linux - irrlicht
        - libevent-stable - libevent-stable
        mat_macos_platform_x86: mat_macos_platform_x86:
        ...@@ -125,11 +125,7 @@ mat_windows: ...@@ -125,11 +125,7 @@ mat_windows:
        - wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx - - wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
        - mv libevent-2.0.22-stable event ; cp -rf event/WIN32-Code/* event/include - mv libevent-2.0.22-stable event ; cp -rf event/WIN32-Code/* event/include
        # irrlicht # irrlicht
        - wget https://cdn01.moecube.com/ygopro-build-materials/irrlicht-1.8.4.zip - git clone --depth=1 https://code.mycard.moe/mycard/irrlicht-new irrlicht
        - 7z x -y irrlicht-1.8.4.zip
        - mv premake/irrlicht .
        - mv irrlicht-1.8.4/source/Irrlicht irrlicht/src
        - mv irrlicht-1.8.4/include irrlicht/include
        artifacts: artifacts:
        paths: paths:
        - premake5.exe - premake5.exe
        ......
        gframe/premake4.lua
        View file @ f8496c5c
        ...@@ -6,7 +6,7 @@ project "ygopro" ...@@ -6,7 +6,7 @@ project "ygopro"
        files { "**.cpp", "**.cc", "**.c", "**.h" } files { "**.cpp", "**.cc", "**.c", "**.h" }
        excludes { "lzma/**", "spmemvfs/**" } excludes { "lzma/**", "spmemvfs/**" }
        includedirs { "../ocgcore" } includedirs { "../ocgcore", "../irrlicht/include" }
        links { "ocgcore", "clzma", "cspmemvfs", "Irrlicht", "sqlite3", "freetype", "event" } links { "ocgcore", "clzma", "cspmemvfs", "Irrlicht", "sqlite3", "freetype", "event" }
        if USE_IRRKLANG then if USE_IRRKLANG then
        defines { "YGOPRO_USE_IRRKLANG" } defines { "YGOPRO_USE_IRRKLANG" }
        ...@@ -20,7 +20,7 @@ project "ygopro" ...@@ -20,7 +20,7 @@ project "ygopro"
        configuration "windows" configuration "windows"
        files "ygopro.rc" files "ygopro.rc"
        excludes "CGUIButton.cpp" excludes "CGUIButton.cpp"
        includedirs { "../irrlicht/include", "../freetype/include", "../event/include", "../sqlite3" } includedirs { "../freetype/include", "../event/include", "../sqlite3" }
        links { "lua" } links { "lua" }
        if USE_IRRKLANG then if USE_IRRKLANG then
        links { "irrKlang" } links { "irrKlang" }
        ...@@ -61,7 +61,6 @@ project "ygopro" ...@@ -61,7 +61,6 @@ project "ygopro"
        links "GL" links "GL"
        configuration "linux" configuration "linux"
        linkoptions { "-static-libstdc++", "-static-libgcc", "-Wl,-rpath=./lib/" } linkoptions { "-static-libstdc++", "-static-libgcc", "-Wl,-rpath=./lib/" }
        includedirs { "../irrlicht_linux/include" }
        if BUILD_LUA then if BUILD_LUA then
        links { "lua" } links { "lua" }
        else else
        ...@@ -74,7 +73,6 @@ project "ygopro" ...@@ -74,7 +73,6 @@ project "ygopro"
        end end
        configuration "macosx" configuration "macosx"
        links { "lua" } links { "lua" }
        includedirs { "../irrlicht/include" }
        libdirs { "../irrlicht" } libdirs { "../irrlicht" }
        if MAC_ARM then if MAC_ARM then
        buildoptions { "--target=arm64-apple-macos11" } buildoptions { "--target=arm64-apple-macos11" }
        ......
        premake5.lua
        View file @ f8496c5c
        ...@@ -124,7 +124,6 @@ end ...@@ -124,7 +124,6 @@ end
        include "lua" include "lua"
        include "event" include "event"
        include "freetype" include "freetype"
        include "irrlicht"
        include "sqlite3" include "sqlite3"
        else else
        if BUILD_LUA then if BUILD_LUA then
        ...@@ -137,8 +136,8 @@ end ...@@ -137,8 +136,8 @@ end
        include "freetype" include "freetype"
        end end
        end end
        if os.ishost("linux") then if not os.ishost("macosx") then
        include "irrlicht_linux" include "irrlicht"
        end end
        if USE_IRRKLANG then if USE_IRRKLANG then
        include "ikpmp3" include "ikpmp3"
        ......
        script @ ef32ed0d
        Subproject commit 3a75e12cda3ae09e6ff1272029c00b3bfb0db3e4 Subproject commit ef32ed0d101ae56101c1fb4d13f66b72cc485fe8
        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