fix that stupid filter mistake + remove unnecessary filter reset
This commit is contained in:
parent
41e0335754
commit
11f052bd31
@ -325,13 +325,11 @@ filter {} -- reset the filter and remove all active keywords
|
|||||||
configurations { "debug", "release", }
|
configurations { "debug", "release", }
|
||||||
platforms { "x64", "x32", }
|
platforms { "x64", "x32", }
|
||||||
language "C++"
|
language "C++"
|
||||||
|
|
||||||
cppdialect "C++17"
|
cppdialect "C++17"
|
||||||
cdialect "C17"
|
cdialect "C17"
|
||||||
filter { "system:linux", "action:gmake*" , }
|
filter { "system:linux", "action:gmake*" , }
|
||||||
cdialect("gnu17") -- gamepad.c relies on some linux-specific functions like strdup() and MAX_PATH
|
cdialect("gnu17") -- gamepad.c relies on some linux-specific functions like strdup() and MAX_PATH
|
||||||
filter {} -- reset the filter and remove all active keywords
|
filter {} -- reset the filter and remove all active keywords
|
||||||
|
|
||||||
characterset "Unicode"
|
characterset "Unicode"
|
||||||
staticruntime "on" -- /MT or /MTd
|
staticruntime "on" -- /MT or /MTd
|
||||||
runtime "Release" -- ensure we never link with /MTd, otherwise deps linking will fail
|
runtime "Release" -- ensure we never link with /MTd, otherwise deps linking will fail
|
||||||
@ -362,11 +360,11 @@ filter { "platforms:x32", }
|
|||||||
architecture "x86"
|
architecture "x86"
|
||||||
filter { "platforms:x64", }
|
filter { "platforms:x64", }
|
||||||
architecture "x86_64"
|
architecture "x86_64"
|
||||||
filter {} -- reset the filter and remove all active keywords
|
|
||||||
|
|
||||||
|
|
||||||
-- debug/optimization flags
|
-- debug/optimization flags
|
||||||
---------
|
---------
|
||||||
|
filter {} -- reset the filter and remove all active keywords
|
||||||
intrinsics "On"
|
intrinsics "On"
|
||||||
filter { "configurations:*debug", }
|
filter { "configurations:*debug", }
|
||||||
symbols "On"
|
symbols "On"
|
||||||
@ -374,7 +372,6 @@ filter { "configurations:*debug", }
|
|||||||
filter { "configurations:*release", }
|
filter { "configurations:*release", }
|
||||||
symbols "Off"
|
symbols "Off"
|
||||||
optimize "On"
|
optimize "On"
|
||||||
filter {} -- reset the filter and remove all active keywords
|
|
||||||
|
|
||||||
|
|
||||||
--- common compiler/linker options
|
--- common compiler/linker options
|
||||||
@ -428,7 +425,6 @@ filter { "system:linux" }
|
|||||||
defines {
|
defines {
|
||||||
"GNUC",
|
"GNUC",
|
||||||
}
|
}
|
||||||
filter {} -- reset the filter and remove all active keywords
|
|
||||||
|
|
||||||
|
|
||||||
-- MinGw on Windows
|
-- MinGw on Windows
|
||||||
|
Loading…
x
Reference in New Issue
Block a user