Commit ce7bc818 authored by mercury233's avatar mercury233

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

parents 4dbad925 fd106c48
This diff is collapsed.
...@@ -212,7 +212,7 @@ end ...@@ -212,7 +212,7 @@ end
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"
...@@ -222,8 +222,7 @@ end ...@@ -222,8 +222,7 @@ end
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"
......
...@@ -1152,3 +1152,6 @@ ...@@ -1152,3 +1152,6 @@
!setname 0x1185 涂鸦兽 らくがきじゅう !setname 0x1185 涂鸦兽 らくがきじゅう
!setname 0x2185 涂鸦本 らくがきちょう !setname 0x2185 涂鸦本 らくがきちょう
!setname 0x186 G石人 Gゴーレム !setname 0x186 G石人 Gゴーレム
!setname 0x187 桥梁 架け橋
!setname 0x188 深渊之兽 ビーステッド
!setname 0x189 俱舍怒威族 クシャトリラ
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