Skip to content

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

Merge branch 'develop-static-build' into develop

parents 534cb075 9cd5900a
Pipeline #36835 canceled with stages
        in 2 minutes and 55 seconds
        Expand all Hide whitespace changes
        Inline Side-by-side
        Showing with 541 additions and 218 deletions
        .ci/build-opus.sh deleted 100755 → 0
        View file @ 534cb075
        #!/bin/sh
        set -x
        set -o errexit
        if [ -n "$NO_AUDIO" ]; then
        echo "Skipping opus build because NO_AUDIO is set"
        exit 0
        fi
        cd miniaudio
        external_built_dir="$PWD/external-built"
        is_macos=false
        if [ "$(uname)" = "Darwin" ]; then
        is_macos=true
        fi
        maybe_patch_configure() {
        if $is_macos; then
        sed -i.bak 's/-force_cpusubtype_ALL//g' configure*
        fi
        }
        build_single_thing() {
        lib_name="$1"
        cd "external/$lib_name"
        shift
        maybe_patch_configure
        PKG_CONFIG_PATH="$external_built_dir/lib/pkgconfig" CFLAGS="$OPUS_FLAGS" CXXFLAGS="$OPUS_FLAGS" ./configure --prefix="$external_built_dir" --enable-static=yes --enable-shared=no "$@"
        make -j$(nproc)
        make install
        cd ../..
        }
        build_single_thing ogg
        build_single_thing opus
        build_single_thing opusfile --disable-examples --disable-http
        build_single_thing vorbis --with-ogg="$external_built_dir"
        cd ..
        .ci/configure-audio.sh 0 → 100755
        View file @ ba5a207a
        #!/bin/bash
        libs_to_configure=(
        "ogg"
        # "opus"
        )
        cd miniaudio/external
        for lib in "${libs_to_configure[@]}"; do
        cd $lib
        ./configure
        cd ..
        done
        .ci/configure-libevent.sh 0 → 100755
        View file @ ba5a207a
        #!/bin/sh
        set -x
        set -o errexit
        cd event
        ./configure --disable-openssl --enable-static=yes --enable-shared=no
        sed -f make-event-config.sed < config.h > ./include/event2/event-config.h
        cd ..
        .ci/exec-macos-platform.sh
        View file @ ba5a207a
        ...@@ -4,23 +4,13 @@ set -o errexit ...@@ -4,23 +4,13 @@ set -o errexit
        TARGET_PLATFORM=$(arch) TARGET_PLATFORM=$(arch)
        TARGET_YGOPRO_BINARY_PATH=./ygopro-platforms/ygopro-platform-$TARGET_PLATFORM TARGET_YGOPRO_BINARY_PATH=./ygopro-platforms/ygopro-platform-$TARGET_PLATFORM
        export EVENT_INCLUDE_DIR=$PWD/libevent-stable/include
        export EVENT_LIB_DIR=$PWD/libevent-stable/lib ./.ci/configure-libevent.sh
        export OPUS_INCLUDE_DIR=$PWD/miniaudio/external-built/include/opus ./.ci/configure-audio.sh
        export OPUS_LIB_DIR=$PWD/miniaudio/external-built/lib
        export OPUSFILE_INCLUDE_DIR=$PWD/miniaudio/external-built/include/opus rm -rf sqlite3/VERSION sqlite3/version
        export OPUSFILE_LIB_DIR=$PWD/miniaudio/external-built/lib
        export VORBIS_INCLUDE_DIR=$PWD/miniaudio/external-built/include ./premake5 gmake --cc=clang
        export VORBIS_LIB_DIR=$PWD/miniaudio/external-built/lib
        export OGG_INCLUDE_DIR=$PWD/miniaudio/external-built/include
        export OGG_LIB_DIR=$PWD/miniaudio/external-built/lib
        export ACLOCAL=aclocal
        export AUTOMAKE=automake
        ./.ci/libevent-prebuild.sh
        ./.ci/build-opus.sh
        ./premake5 gmake --cc=clang --build-freetype --build-sqlite
        cd build cd build
        make config=release -j$(sysctl -n hw.ncpu) make config=release -j$(sysctl -n hw.ncpu)
        ......
        .ci/libevent-prebuild.sh deleted 100755 → 0
        View file @ 534cb075
        #!/bin/sh
        set -x
        set -o errexit
        # PROCESSOR_COUNT=4
        if [ -d "libevent-stable" ]; then
        rm -rf libevent-stable
        fi
        if [ ! -d "libevent-2.0.22-stable" ]; then
        wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
        fi
        install_path="$PWD/libevent-stable"
        cd libevent-2.0.22-stable
        ./configure "--prefix=$install_path" --disable-openssl --enable-static=yes --enable-shared=no "$@"
        make -j$(nproc)
        make install
        cd ..
        .github/workflows/build.yml
        View file @ ba5a207a
        This diff is collapsed.
        .gitlab-ci.yml
        View file @ ba5a207a
        ...@@ -14,14 +14,17 @@ mat_common: ...@@ -14,14 +14,17 @@ mat_common:
        - linux - linux
        script: script:
        # lua # lua
        - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/lua-5.4.4.tar.gz | tar zfx - - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/lua-5.4.7.tar.gz | tar zfx -
        - mv lua-5.4.4 lua - mv lua-5.4.7 lua
        # sqlite3 # sqlite3
        - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/sqlite-autoconf-3390300.tar.gz | tar zfx - - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/sqlite-autoconf-3490100.tar.gz | tar zfx -
        - mv sqlite-autoconf-3390300 sqlite3 - mv sqlite-autoconf-3490100 sqlite3
        # freetype # freetype
        - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/freetype-2.11.1.tar.gz | tar zfx - - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/freetype-2.13.3.tar.gz | tar zfx -
        - mv freetype-2.11.1 freetype - mv freetype-2.13.3 freetype
        # event
        - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/libevent-2.1.12-stable.tar.gz | tar zfx -
        - mv libevent-2.1.12-stable event
        # irrlicht # irrlicht
        - ./.ci/prepare-irrlicht.sh - ./.ci/prepare-irrlicht.sh
        # miniaudio # miniaudio
        ...@@ -33,6 +36,7 @@ mat_common: ...@@ -33,6 +36,7 @@ mat_common:
        - lua - lua
        - freetype - freetype
        - sqlite3 - sqlite3
        - event
        - irrlicht - irrlicht
        - miniaudio - miniaudio
        ...@@ -68,7 +72,7 @@ mat_macos: ...@@ -68,7 +72,7 @@ mat_macos:
        - linux - linux
        script: script:
        - apt update; apt -y install wget tar - apt update; apt -y install wget tar
        - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/premake-5.0.0-beta5-macosx.tar.gz | tar zfx - - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/premake-5.0.0-beta6-macosx.tar.gz | tar zfx -
        - chmod +x premake5 - chmod +x premake5
        artifacts: artifacts:
        paths: paths:
        ...@@ -81,25 +85,21 @@ mat_windows: ...@@ -81,25 +85,21 @@ mat_windows:
        script: script:
        - apt update; apt -y install wget tar patch p7zip-full - apt update; apt -y install wget tar patch p7zip-full
        # premake5.exe # premake5.exe
        - wget https://cdn02.moecube.com:444/ygopro-build-materials/premake-5.0.0-beta5-windows.zip - wget https://cdn02.moecube.com:444/ygopro-build-materials/premake-5.0.0-beta6-windows.zip
        - 7z x -y premake-5.0.0-beta5-windows.zip - 7z x -y premake-5.0.0-beta6-windows.zip
        # event
        - wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
        - mv libevent-2.0.22-stable event
        artifacts: artifacts:
        paths: paths:
        - premake5.exe - premake5.exe
        - event
        ._exec_build: ._exec_build:
        stage: build stage: build
        variables: variables:
        NO_LUA_SAFE: '1' # on client no lua safe NO_LUA_SAFE: '1' # on client no lua safe
        cache: #cache:
        key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" # key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
        paths: # paths:
        - bin/ # - bin/
        - obj/ # - obj/
        exec_windows: exec_windows:
        extends: ._exec_build extends: ._exec_build
        ...@@ -112,14 +112,28 @@ exec_windows: ...@@ -112,14 +112,28 @@ exec_windows:
        script: script:
        - bash -c 'cp -rf premake/* . ; cp -rf resource/* .' - bash -c 'cp -rf premake/* . ; cp -rf resource/* .'
        - '.\premake5.exe vs2019' - '.\premake5.exe vs2019'
        - cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" build\YGOPro.sln /m /p:Configuration=Release' - cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" build\YGOPro.sln /m /p:Configuration=Release /p:Platform=x64'
        - copy bin\release\ygopro.exe . - copy bin\release\x64\ygopro.exe .
        artifacts: artifacts:
        paths: paths:
        - ygopro.exe - ygopro.exe
        .exec_linux: .exec_unix:
        extends: ._exec_build extends: ._exec_build
        variables:
        BUILD_FREETYPE: '1'
        BUILD_SQLITE: '1'
        BUILD_IRRLICHT: '1'
        BUILD_EVENT: '1'
        BUILD_OPUS_VORBIS: '1'
        AUDIO_LIB: 'miniaudio'
        MINIAUDIO_SUPPORT_OPUS_VORBIS: '1'
        BUILD_OPUS_VORBIS: '1'
        before_script:
        - ./.ci/configure-libevent.sh
        .exec_linux:
        extends: .exec_unix
        tags: tags:
        - linux - linux
        image: git-registry.moenext.com/mycard/docker-ygopro-builder image: git-registry.moenext.com/mycard/docker-ygopro-builder
        ...@@ -127,20 +141,9 @@ exec_windows: ...@@ -127,20 +141,9 @@ exec_windows:
        - mat_common - mat_common
        #- mat_linux #- mat_linux
        - mat_submodules - mat_submodules
        variables:
        EVENT_INCLUDE_DIR: /usr/share/libevent-stable/include
        EVENT_LIB_DIR: /usr/share/libevent-stable/lib
        OPUS_INCLUDE_DIR: $CI_PROJECT_DIR/miniaudio/external-built/include/opus
        OPUS_LIB_DIR: $CI_PROJECT_DIR/miniaudio/external-built/lib
        OPUSFILE_INCLUDE_DIR: $CI_PROJECT_DIR/miniaudio/external-built/include/opus
        OPUSFILE_LIB_DIR: $CI_PROJECT_DIR/miniaudio/external-built/lib
        VORBIS_INCLUDE_DIR: $CI_PROJECT_DIR/miniaudio/external-built/include
        VORBIS_LIB_DIR: $CI_PROJECT_DIR/miniaudio/external-built/lib
        OGG_INCLUDE_DIR: $CI_PROJECT_DIR/miniaudio/external-built/include
        OGG_LIB_DIR: $CI_PROJECT_DIR/miniaudio/external-built/lib
        script: script:
        - ./.ci/build-opus.sh - ./.ci/configure-audio.sh
        - premake5 gmake --build-freetype --build-sqlite - premake5 gmake
        - cd build - cd build
        - make config=release -j$(nproc) - make config=release -j$(nproc)
        - cd .. - cd ..
        ...@@ -152,6 +155,8 @@ exec_windows: ...@@ -152,6 +155,8 @@ exec_windows:
        exec_linux: exec_linux:
        extends: .exec_linux extends: .exec_linux
        tags:
        - avx2
        exec_linuxarm: exec_linuxarm:
        extends: .exec_linux extends: .exec_linux
        ...@@ -163,7 +168,7 @@ exec_linuxarm: ...@@ -163,7 +168,7 @@ exec_linuxarm:
        image: git-registry.moenext.com/mycard/docker-ygopro-builder:fpic # use a special docker image for arm build, which has fPIC enabled by default image: git-registry.moenext.com/mycard/docker-ygopro-builder:fpic # use a special docker image for arm build, which has fPIC enabled by default
        ._exec_macos_platform: ._exec_macos_platform:
        extends: ._exec_build extends: .exec_unix
        dependencies: dependencies:
        - mat_macos - mat_macos
        - mat_common - mat_common
        ......
        gframe/premake5.lua
        View file @ ba5a207a
        ...@@ -16,6 +16,7 @@ project "YGOPro" ...@@ -16,6 +16,7 @@ project "YGOPro"
        else else
        includedirs { EVENT_INCLUDE_DIR } includedirs { EVENT_INCLUDE_DIR }
        libdirs { EVENT_LIB_DIR } libdirs { EVENT_LIB_DIR }
        links { "event_pthreads" }
        end end
        if BUILD_IRRLICHT then if BUILD_IRRLICHT then
        ...@@ -67,9 +68,10 @@ project "YGOPro" ...@@ -67,9 +68,10 @@ project "YGOPro"
        end end
        filter "system:windows" filter "system:windows"
        entrypoint "mainCRTStartup"
        defines { "_IRR_WCHAR_FILESYSTEM" } defines { "_IRR_WCHAR_FILESYSTEM" }
        files "ygopro.rc" files "ygopro.rc"
        links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32", "Dnsapi" } links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32", "Dnsapi", "iphlpapi" }
        if USE_AUDIO and AUDIO_LIB == "irrklang" then if USE_AUDIO and AUDIO_LIB == "irrklang" then
        links { "irrKlang" } links { "irrKlang" }
        if IRRKLANG_PRO then if IRRKLANG_PRO then
        ...@@ -82,15 +84,17 @@ project "YGOPro" ...@@ -82,15 +84,17 @@ project "YGOPro"
        end end
        end end
        filter "not system:windows" filter "not system:windows"
        links { "event_pthreads", "dl", "pthread", "resolv" } links { "dl", "pthread", "resolv" }
        filter "system:macosx" filter "system:macosx"
        openmp "Off" openmp "Off"
        links { "z" } links { "z" }
        defines { "GL_SILENCE_DEPRECATION" } defines { "GL_SILENCE_DEPRECATION" }
        if MAC_ARM then if MAC_ARM then
        buildoptions { "--target=arm64-apple-macos12" }
        linkoptions { "-arch arm64" } linkoptions { "-arch arm64" }
        end end
        if MAC_INTEL then
        linkoptions { "-arch x86_64" }
        end
        if USE_AUDIO and AUDIO_LIB == "irrklang" then if USE_AUDIO and AUDIO_LIB == "irrklang" then
        links { "irrklang" } links { "irrklang" }
        end end
        ......
        ocgcore @ 15b26798
        Subproject commit ab7ef30f678a7356e0fca85b0091fcdf56581b35 Subproject commit 15b26798847a8af75b7f1f03a9a7df1583ae96af
        premake/event/premake5.lua
        View file @ ba5a207a
        ...@@ -8,7 +8,18 @@ project "event" ...@@ -8,7 +8,18 @@ project "event"
        "evmap.c", "log.c", "evutil.c", "evutil_rand.c", "strlcpy.c", "signal.c", "evmap.c", "log.c", "evutil.c", "evutil_rand.c", "strlcpy.c", "signal.c",
        "event_tagging.c", "http.c", "evdns.c", "evrpc.c" } "event_tagging.c", "http.c", "evdns.c", "evrpc.c" }
        if os.isfile("evutil_time.c") then
        files { "evutil_time.c" }
        end
        filter "system:windows" filter "system:windows"
        prebuildcommands { "xcopy /E /Y $(ProjectDir)..\\event\\WIN32-Code $(ProjectDir)..\\event\\include" } prebuildcommands { "xcopy /E /Y $(ProjectDir)..\\event\\WIN32-Code $(ProjectDir)..\\event\\include",
        "xcopy /E /Y $(ProjectDir)..\\event\\WIN32-Code\\nmake $(ProjectDir)..\\event\\include" }
        files { "win32select.c", "evthread_win32.c", "buffer_iocp.c", "event_iocp.c", "bufferevent_async.c" } files { "win32select.c", "evthread_win32.c", "buffer_iocp.c", "event_iocp.c", "bufferevent_async.c" }
        defines { "WIN32" } -- quirk of old libevent defines { "UINT32_MAX=0xffffffffui32" } -- quirk of libevent 2.1.2
        filter "system:linux"
        files { "evthread_pthread.c", "epoll.c", "epoll_sub.c", "poll.c", "select.c" }
        filter "system:macosx"
        files { "evthread_pthread.c", "kqueue.c", "poll.c", "select.c" }
        premake/irrlicht/premake5.lua
        View file @ ba5a207a
        ...@@ -155,7 +155,11 @@ project "irrlicht" ...@@ -155,7 +155,11 @@ project "irrlicht"
        filter { "system:windows" } filter { "system:windows" }
        defines { "_IRR_WCHAR_FILESYSTEM" } defines { "_IRR_WCHAR_FILESYSTEM" }
        includedirs { "$(DXSDK_DIR)Include" } if USE_DXSDK then
        includedirs { "$(DXSDK_DIR)Include" }
        else
        defines { "NO_IRR_COMPILE_WITH_DIRECT3D_9_" }
        end
        filter { "system:linux" } filter { "system:linux" }
        links { "X11", "Xxf86vm" } links { "X11", "Xxf86vm" }
        ......
        premake/miniaudio/premake5.lua
        View file @ ba5a207a
        ...@@ -33,12 +33,6 @@ project "miniaudio" ...@@ -33,12 +33,6 @@ project "miniaudio"
        "external/opus/celt/rate.c", "external/opus/celt/rate.c",
        "external/opus/celt/vq.c", "external/opus/celt/vq.c",
        "external/opus/celt/x86/pitch_avx.c",
        "external/opus/celt/x86/pitch_sse.c",
        "external/opus/celt/x86/vq_sse2.c",
        "external/opus/celt/x86/x86_celt_map.c",
        "external/opus/celt/x86/x86cpu.c",
        "external/opus/silk/bwexpander.c", "external/opus/silk/bwexpander.c",
        "external/opus/silk/bwexpander_32.c", "external/opus/silk/bwexpander_32.c",
        "external/opus/silk/CNG.c", "external/opus/silk/CNG.c",
        ...@@ -118,10 +112,25 @@ project "miniaudio" ...@@ -118,10 +112,25 @@ project "miniaudio"
        "external/vorbis/include", "external/vorbis/include",
        } }
        defines { defines {
        "OPUS_BUILD", "USE_ALLOCA", "HAVE_LRINTF", "OP_HAVE_LRINTF", "OPUS_BUILD",
        "OPUS_X86_PRESUME_SSE", "OPUS_X86_PRESUME_SSE2", "USE_ALLOCA",
        "OPUS_HAVE_RTCD", "OPUS_X86_MAY_HAVE_SSE", "OPUS_X86_MAY_HAVE_SSE4_1", "OPUS_X86_MAY_HAVE_AVX2", "HAVE_LRINTF",
        "OP_HAVE_LRINTF",
        } }
        if not TARGET_MAC_ARM and not IS_ARM and not MAC_INTEL then
        files {
        "external/opus/celt/x86/pitch_avx.c",
        "external/opus/celt/x86/pitch_sse.c",
        "external/opus/celt/x86/vq_sse2.c",
        "external/opus/celt/x86/x86_celt_map.c",
        "external/opus/celt/x86/x86cpu.c",
        }
        defines {
        "OPUS_HAVE_RTCD", "CPU_INFO_BY_ASM",
        "OPUS_X86_PRESUME_SSE", "OPUS_X86_PRESUME_SSE2",
        "OPUS_X86_MAY_HAVE_SSE", "OPUS_X86_MAY_HAVE_SSE4_1", "OPUS_X86_MAY_HAVE_AVX2",
        }
        end
        else else
        includedirs { OPUS_INCLUDE_DIR, OPUSFILE_INCLUDE_DIR, VORBIS_INCLUDE_DIR, OGG_INCLUDE_DIR } includedirs { OPUS_INCLUDE_DIR, OPUSFILE_INCLUDE_DIR, VORBIS_INCLUDE_DIR, OGG_INCLUDE_DIR }
        end end
        ......
        premake5.lua
        View file @ ba5a207a
        -- default global settings -- Supported systems: Windows, Linux, MacOS
        -- Global settings
        -- Default: Build Lua, Irrlicht from source on all systems.
        -- Don't build event, freetype, sqlite, opus, vorbis on Linux or MacOS, use apt or homebrew,
        -- but build them on Windows, due to the lack of package manager on Windows.
        BUILD_LUA = true BUILD_LUA = true
        LUA_LIB_NAME = "lua" LUA_LIB_NAME = "lua" -- change this if you don't build Lua
        BUILD_EVENT = os.istarget("windows") BUILD_EVENT = os.istarget("windows")
        BUILD_FREETYPE = os.istarget("windows") BUILD_FREETYPE = os.istarget("windows")
        BUILD_SQLITE = os.istarget("windows") BUILD_SQLITE = os.istarget("windows")
        BUILD_IRRLICHT = true BUILD_IRRLICHT = true -- modified Irrlicht is required, can't use the official one
        USE_DXSDK = true
        USE_AUDIO = true USE_AUDIO = true
        AUDIO_LIB = "miniaudio" AUDIO_LIB = "miniaudio" -- can be "miniaudio" or "irrklang"
        -- BUILD_MINIAUDIO is always true
        MINIAUDIO_SUPPORT_OPUS_VORBIS = true MINIAUDIO_SUPPORT_OPUS_VORBIS = true
        MINIAUDIO_BUILD_OPUS_VORBIS = os.istarget("windows") MINIAUDIO_BUILD_OPUS_VORBIS = os.istarget("windows")
        -- BUILD_IRRKLANG is impossible because irrKlang is not open source
        IRRKLANG_PRO = false IRRKLANG_PRO = false
        IRRKLANG_PRO_BUILD_IKPMP3 = false IRRKLANG_PRO_BUILD_IKPMP3 = false
        -- read settings from command line or environment variables -- Read settings from command line or environment variables
        newoption { trigger = "build-lua", category = "YGOPro - lua", description = "" } newoption { trigger = "build-lua", category = "YGOPro - lua", description = "" }
        newoption { trigger = "no-build-lua", category = "YGOPro - lua", description = "" } newoption { trigger = "no-build-lua", category = "YGOPro - lua", description = "" }
        ...@@ -43,6 +52,7 @@ newoption { trigger = "build-irrlicht", category = "YGOPro - irrlicht", descript ...@@ -43,6 +52,7 @@ newoption { trigger = "build-irrlicht", category = "YGOPro - irrlicht", descript
        newoption { trigger = "no-build-irrlicht", category = "YGOPro - irrlicht", description = "" } newoption { trigger = "no-build-irrlicht", category = "YGOPro - irrlicht", description = "" }
        newoption { trigger = "irrlicht-include-dir", category = "YGOPro - irrlicht", description = "", value = "PATH" } newoption { trigger = "irrlicht-include-dir", category = "YGOPro - irrlicht", description = "", value = "PATH" }
        newoption { trigger = "irrlicht-lib-dir", category = "YGOPro - irrlicht", description = "", value = "PATH" } newoption { trigger = "irrlicht-lib-dir", category = "YGOPro - irrlicht", description = "", value = "PATH" }
        newoption { trigger = "no-dxsdk", category = "YGOPro - irrlicht", description = "" }
        newoption { trigger = "no-audio", category = "YGOPro", description = "" } newoption { trigger = "no-audio", category = "YGOPro", description = "" }
        newoption { trigger = "audio-lib", category = "YGOPro", description = "", value = "miniaudio, irrklang", default = AUDIO_LIB } newoption { trigger = "audio-lib", category = "YGOPro", description = "", value = "miniaudio, irrklang", default = AUDIO_LIB }
        ...@@ -72,7 +82,8 @@ newoption { trigger = "irrklang-pro-debug-lib-dir", category = "YGOPro - irrklan ...@@ -72,7 +82,8 @@ newoption { trigger = "irrklang-pro-debug-lib-dir", category = "YGOPro - irrklan
        newoption { trigger = 'build-ikpmp3', category = "YGOPro - irrklang - ikpmp3", description = "" } newoption { trigger = 'build-ikpmp3', category = "YGOPro - irrklang - ikpmp3", description = "" }
        newoption { trigger = "winxp-support", category = "YGOPro", description = "" } newoption { trigger = "winxp-support", category = "YGOPro", description = "" }
        newoption { trigger = "mac-arm", category = "YGOPro", description = "Cross compile for Apple Silicon" } newoption { trigger = "mac-arm", category = "YGOPro", description = "Compile for Apple Silicon Mac" }
        newoption { trigger = "mac-intel", category = "YGOPro", description = "Compile for Intel Mac" }
        -- koishipro specific -- koishipro specific
        ...@@ -134,9 +145,9 @@ elseif GetParam("no-build-lua") then ...@@ -134,9 +145,9 @@ elseif GetParam("no-build-lua") then
        BUILD_LUA = false BUILD_LUA = false
        end end
        if not BUILD_LUA then if not BUILD_LUA then
        -- at most times you need to change this if you change BUILD_LUA to false -- at most times you need to change those if you change BUILD_LUA to false
        -- make sure your lua lib is built with C++ and version >= 5.3 -- make sure your lua lib is built with C++ and version >= 5.3
        LUA_LIB_NAME = GetParam("lua-lib-name") LUA_LIB_NAME = GetParam("lua-lib-name") or LUA_LIB_NAME
        LUA_INCLUDE_DIR = GetParam("lua-include-dir") or os.findheader("lua.h") LUA_INCLUDE_DIR = GetParam("lua-include-dir") or os.findheader("lua.h")
        LUA_LIB_DIR = GetParam("lua-lib-dir") or os.findlib(LUA_LIB_NAME) LUA_LIB_DIR = GetParam("lua-lib-dir") or os.findlib(LUA_LIB_NAME)
        end end
        ...@@ -162,7 +173,7 @@ if GetParam("lua-deb") then ...@@ -162,7 +173,7 @@ if GetParam("lua-deb") then
        end end
        if GetParam("build-event") then if GetParam("build-event") then
        BUILD_EVENT = os.istarget("windows") -- only on windows for now BUILD_EVENT = true
        elseif GetParam("no-build-event") then elseif GetParam("no-build-event") then
        BUILD_EVENT = false BUILD_EVENT = false
        end end
        ...@@ -201,6 +212,16 @@ if not BUILD_IRRLICHT then ...@@ -201,6 +212,16 @@ if not BUILD_IRRLICHT then
        IRRLICHT_LIB_DIR = GetParam("irrlicht-lib-dir") or os.findlib("irrlicht") IRRLICHT_LIB_DIR = GetParam("irrlicht-lib-dir") or os.findlib("irrlicht")
        end end
        if GetParam("no-dxsdk") then
        USE_DXSDK = false
        end
        if USE_DXSDK and os.istarget("windows") then
        if not os.getenv("DXSDK_DIR") then
        print("DXSDK_DIR environment variable not set, it seems you don't have the DirectX SDK installed. DirectX mode will be disabled.")
        USE_DXSDK = false
        end
        end
        if GetParam("no-audio") then if GetParam("no-audio") then
        USE_AUDIO = false USE_AUDIO = false
        elseif GetParam("no-use-miniaudio") then elseif GetParam("no-use-miniaudio") then
        ...@@ -293,8 +314,9 @@ function spawn(cmd) ...@@ -293,8 +314,9 @@ function spawn(cmd)
        end end
        function isRunningUnderRosetta() function isRunningUnderRosetta()
        local rosetta_result=spawn("sysctl -n sysctl.proc_translated 2>/dev/null") local uname = os.outputof("uname -m")
        return tonumber(rosetta_result) == 1 local proctranslated = os.outputof("sysctl sysctl.proc_translated")
        return uname:find("arm") or proctranslated
        end end
        function IsRunningUnderARM() function IsRunningUnderARM()
        ...@@ -336,8 +358,25 @@ function isARM() ...@@ -336,8 +358,25 @@ function isARM()
        return false return false
        end end
        IS_ARM=isARM() or GetParam("mac-arm") -- detect if the current system is ARM IS_ARM=isARM()
        MAC_ARM=os.istarget("macosx") and IS_ARM
        if os.istarget("macosx") then
        if GetParam("mac-arm") then
        MAC_ARM = true
        end
        if GetParam("mac-intel") then
        MAC_INTEL = true
        end
        if MAC_ARM then
        TARGET_MAC_ARM = true
        elseif not MAC_INTEL then
        -- automatic target arm64, need extra detect
        if isRunningUnderRosetta() then
        TARGET_MAC_ARM = true
        end
        end
        end
        workspace "YGOPro" workspace "YGOPro"
        location "build" location "build"
        ...@@ -357,7 +396,6 @@ workspace "YGOPro" ...@@ -357,7 +396,6 @@ workspace "YGOPro"
        filter "system:windows" filter "system:windows"
        entrypoint "mainCRTStartup"
        systemversion "latest" systemversion "latest"
        startproject "YGOPro" startproject "YGOPro"
        if WINXP_SUPPORT then if WINXP_SUPPORT then
        ...@@ -366,11 +404,24 @@ workspace "YGOPro" ...@@ -366,11 +404,24 @@ workspace "YGOPro"
        else else
        defines { "WINVER=0x0601" } -- WIN7 defines { "WINVER=0x0601" } -- WIN7
        end end
        platforms { "Win32", "x64" }
        filter { "system:windows", "platforms:Win32" }
        architecture "x86"
        filter { "system:windows", "platforms:x64" }
        architecture "x86_64"
        filter "system:macosx" filter "system:macosx"
        libdirs { "/usr/local/lib" } libdirs { "/usr/local/lib" }
        if MAC_ARM then if MAC_ARM then
        buildoptions { "--target=arm64-apple-macos12" } buildoptions { "-arch arm64" }
        end
        if MAC_INTEL then
        buildoptions { "-arch x86_64", "-mavx", "-mfma" }
        end
        if MAC_ARM and MAC_INTEL then
        architecture "universal"
        end end
        links { "OpenGL.framework", "Cocoa.framework", "IOKit.framework" } links { "OpenGL.framework", "Cocoa.framework", "IOKit.framework" }
        ...@@ -386,6 +437,18 @@ workspace "YGOPro" ...@@ -386,6 +437,18 @@ workspace "YGOPro"
        defines "_DEBUG" defines "_DEBUG"
        targetdir "bin/debug" targetdir "bin/debug"
        filter { "system:windows", "platforms:Win32", "configurations:Release" }
        targetdir "bin/release/x86"
        filter { "system:windows", "platforms:Win32", "configurations:Debug" }
        targetdir "bin/debug/x86"
        filter { "system:windows", "platforms:x64", "configurations:Release" }
        targetdir "bin/release/x64"
        filter { "system:windows", "platforms:x64", "configurations:Debug" }
        targetdir "bin/debug/x64"
        filter { "configurations:Release", "action:vs*" } filter { "configurations:Release", "action:vs*" }
        if linktimeoptimization then if linktimeoptimization then
        linktimeoptimization "On" linktimeoptimization "On"
        ...@@ -398,17 +461,6 @@ workspace "YGOPro" ...@@ -398,17 +461,6 @@ workspace "YGOPro"
        filter { "configurations:Release", "not action:vs*" } filter { "configurations:Release", "not action:vs*" }
        symbols "On" symbols "On"
        defines "NDEBUG" defines "NDEBUG"
        if not IS_ARM then
        buildoptions "-march=native"
        end
        if IS_ARM and not MAC_ARM then
        buildoptions {
        "-march=armv8-a",
        "-mtune=cortex-a72",
        "-Wno-psabi"
        }
        pic "On"
        end
        filter { "configurations:Debug", "action:vs*" } filter { "configurations:Debug", "action:vs*" }
        disablewarnings { "6011", "6031", "6054", "6262" } disablewarnings { "6011", "6031", "6054", "6262" }
        ...@@ -424,6 +476,17 @@ workspace "YGOPro" ...@@ -424,6 +476,17 @@ workspace "YGOPro"
        filter "not action:vs*" filter "not action:vs*"
        buildoptions { "-fno-strict-aliasing", "-Wno-multichar", "-Wno-format-security" } buildoptions { "-fno-strict-aliasing", "-Wno-multichar", "-Wno-format-security" }
        if not IS_ARM and not MAC_INTEL then
        buildoptions "-march=native"
        end
        if IS_ARM and not MAC_ARM then
        buildoptions {
        "-march=armv8-a",
        "-mtune=cortex-a72",
        "-Wno-psabi"
        }
        pic "On"
        end
        filter {} filter {}
        ......
        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