Skip to content

Y
ygopro
Commit 21a27fc4 authored by mercury233's avatar mercury233
Browse files
Options

Merge branch 'fh' into patch-show-pack

parents 940e3c5d ab330b7f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
premake5.lua
View file @ 21a27fc4
...@@ -193,7 +193,7 @@ workspace "YGOPro" ...@@ -193,7 +193,7 @@ workspace "YGOPro"
filter { "configurations:Release", "action:vs*" } filter { "configurations:Release", "action:vs*" }
flags { "LinkTimeOptimization" } flags { "LinkTimeOptimization" }
staticruntime "On" 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*" } filter { "configurations:Release", "not action:vs*" }
symbols "On" symbols "On"
...@@ -203,8 +203,7 @@ workspace "YGOPro" ...@@ -203,8 +203,7 @@ workspace "YGOPro"
end end
filter { "configurations:Debug", "action:vs*" } filter { "configurations:Debug", "action:vs*" }
defines { "_ITERATOR_DEBUG_LEVEL=0" } disablewarnings { "4819", "4828", "6011", "6031", "6054", "6262" }
disablewarnings { "4819", "4828" }
filter "action:vs*" filter "action:vs*"
vectorextensions "SSE2" vectorextensions "SSE2"
......
strings.conf
View file @ 21a27fc4
...@@ -1156,3 +1156,4 @@ ...@@ -1156,3 +1156,4 @@
!setname 0x187 桥梁 架け橋 !setname 0x187 桥梁 架け橋
!setname 0x188 深渊之兽 ビーステッド !setname 0x188 深渊之兽 ビーステッド
!setname 0x189 俱舍怒威族 クシャトリラ !setname 0x189 俱舍怒威族 クシャトリラ
!setname 0x18a 魊影 Ghoti
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