Skip to content

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

Merge branch 'develop' into server-develop

parents 1872e6b1 158fa903
Pipeline #36865 passed with stages
        in 8 minutes and 17 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 7 additions and 4 deletions
        .ci/pack-windows-7z.sh
        View file @ c1ca4d86
        ...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
        set -x set -x
        set -o errexit set -o errexit
        ARCHIVE_FILES=(ygopro.exe LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound bot.conf Bot.exe WindBot locales fonts skin pack) ARCHIVE_FILES=(ygopro.exe vcomp140.dll LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound bot.conf Bot.exe WindBot locales fonts skin pack)
        if [[ "$TARGET_LOCALE" == "zh-CN" ]]; then if [[ "$TARGET_LOCALE" == "zh-CN" ]]; then
        ARCHIVE_FILES=("${ARCHIVE_FILES[@]}" update-koishipro) ARCHIVE_FILES=("${ARCHIVE_FILES[@]}" update-koishipro)
        ......
        .ci/pack-windows-dlc.sh
        View file @ c1ca4d86
        ...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
        set -x set -x
        set -o errexit set -o errexit
        ARCHIVE_FILES=(ygopro.exe cards.cdb locales fonts sound textures strings.conf system.conf skin pack) ARCHIVE_FILES=(ygopro.exe vcomp140.dll cards.cdb locales fonts sound textures strings.conf system.conf skin pack)
        if [[ -z "$TARGET_PLATFORM" ]]; then if [[ -z "$TARGET_PLATFORM" ]]; then
        TARGET_PLATFORM=win32 TARGET_PLATFORM=win32
        ......
        .ci/pack-windows.sh
        View file @ c1ca4d86
        ...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
        set -x set -x
        set -o errexit set -o errexit
        ARCHIVE_FILES=(ygopro.exe LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound bot.conf Bot.exe WindBot locales fonts skin pack) ARCHIVE_FILES=(ygopro.exe vcomp140.dll LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound bot.conf Bot.exe WindBot locales fonts skin pack)
        if [[ "$TARGET_LOCALE" == "zh-CN" && "$ARCHIVE_SUFFIX" != "zst" ]]; then if [[ "$TARGET_LOCALE" == "zh-CN" && "$ARCHIVE_SUFFIX" != "zst" ]]; then
        ARCHIVE_FILES=("${ARCHIVE_FILES[@]}" update-koishipro) ARCHIVE_FILES=("${ARCHIVE_FILES[@]}" update-koishipro)
        ......
        premake/miniaudio/premake5.lua
        View file @ c1ca4d86
        ...@@ -130,6 +130,9 @@ project "miniaudio" ...@@ -130,6 +130,9 @@ project "miniaudio"
        "OPUS_X86_PRESUME_SSE", "OPUS_X86_PRESUME_SSE2", "OPUS_X86_PRESUME_SSE", "OPUS_X86_PRESUME_SSE2",
        "OPUS_X86_MAY_HAVE_SSE", "OPUS_X86_MAY_HAVE_SSE4_1", "OPUS_X86_MAY_HAVE_AVX2", "OPUS_X86_MAY_HAVE_SSE", "OPUS_X86_MAY_HAVE_SSE4_1", "OPUS_X86_MAY_HAVE_AVX2",
        } }
        filter "system:linux"
        buildoptions { "-mavx", "-mfma" }
        filter {}
        end 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 }
        ......
        script @ 100512e7
        Subproject commit b2e39fbd4f18b4b54921e1b949bbb825f85821db Subproject commit 100512e7888f819957f60ac40e40d6ebe2c9b631
        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