Merge branch 'master' of https://github.com/Fluorohydride/ygopro into server

ce7bc818 · mercury233 · 4dbad925 · fd106c48 · ce7bc818 · ce7bc818
Commit ce7bc818 authored Aug 01, 2022 by mercury233
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 192 additions and 190 deletions

lflist.conf lflist.conf +187 -187

premake5.lua premake5.lua +2 -3

strings.conf strings.conf +3 -0

No files found.
--- a/lflist.conf
+++ b/lflist.conf
--- a/premake5.lua
+++ b/premake5.lua
@@ -212,7 +212,7 @@ end
    filter { "configurations:Release", "action:vs*" }
        flags { "LinkTimeOptimization" }
        staticruntime "On"
-        disablewarnings { "4244", "4267", "4838", "4577", "4819", "4018", "4996", "4477", "4091", "4828", "4800" }
+        disablewarnings { "4244", "4267", "4838", "4577", "4819", "4018", "4996", "4477", "4091", "4828", "4800", "6011", "6031", "6054", "6262" }
    filter { "configurations:Release", "not action:vs*" }
        symbols "On"
@@ -222,8 +222,7 @@ end
        end
    filter { "configurations:Debug", "action:vs*" }
-        defines { "_ITERATOR_DEBUG_LEVEL=0" }
+        disablewarnings { "4819", "4828", "6011", "6031", "6054", "6262" }
-        disablewarnings { "4819", "4828" }
    filter "action:vs*"
        vectorextensions "SSE2"

--- a/strings.conf
+++ b/strings.conf
@@ -1152,3 +1152,6 @@
 !setname 0x1185 涂鸦兽	らくがきじゅう
 !setname 0x2185 涂鸦本	らくがきちょう
 !setname 0x186 G石人	Gゴーレム
+!setname 0x187 桥梁	架け橋
+!setname 0x188 深渊之兽	ビーステッド
+!setname 0x189 俱舍怒威族	クシャトリラ