Fix clang linux builds (#578)

Also remove hard-coded filter on gmake premake target since it's deprecated in favor of gmake2. It also doesn't matter; what matters is that we filter on gcc, since the warnings we've disabled don't exist in clang and will throw errors.
This commit is contained in:
Graham Pentheny 2022-11-11 20:11:14 -05:00 committed by GitHub
parent e6b675bb9a
commit ea7bfbee70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -75,9 +75,10 @@ project "Detour"
"../Detour/Source/*.cpp" "../Detour/Source/*.cpp"
} }
-- linux library cflags and libs -- linux library cflags and libs
filter {"system:linux", "action:gmake"} filter {"system:linux", "toolset:gcc"}
buildoptions { buildoptions {
"-Wno-error=class-memaccess" "-Wno-error=class-memaccess",
"-Wno-error=maybe-uninitialized"
} }
project "DetourCrowd" project "DetourCrowd"
@ -150,7 +151,7 @@ project "RecastDemo"
targetdir "Bin" targetdir "Bin"
-- linux library cflags and libs -- linux library cflags and libs
filter {"system:linux", "action:gmake"} filter "system:linux"
buildoptions { buildoptions {
"`pkg-config --cflags sdl2`", "`pkg-config --cflags sdl2`",
"`pkg-config --cflags gl`", "`pkg-config --cflags gl`",
@ -163,7 +164,7 @@ project "RecastDemo"
"`pkg-config --libs glu`" "`pkg-config --libs glu`"
} }
filter { "system:linux", "action:gmake*", "files:*.c" } filter { "system:linux", "toolset:gcc", "files:*.c" }
buildoptions { buildoptions {
"-Wno-class-memaccess" "-Wno-class-memaccess"
} }
@ -238,7 +239,7 @@ project "Tests"
targetdir "Bin" targetdir "Bin"
-- linux library cflags and libs -- linux library cflags and libs
filter {"system:linux", "action:gmake"} filter "system:linux"
buildoptions { buildoptions {
"`pkg-config --cflags sdl2`", "`pkg-config --cflags sdl2`",
"`pkg-config --cflags gl`", "`pkg-config --cflags gl`",
@ -248,7 +249,8 @@ project "Tests"
linkoptions { linkoptions {
"`pkg-config --libs sdl2`", "`pkg-config --libs sdl2`",
"`pkg-config --libs gl`", "`pkg-config --libs gl`",
"`pkg-config --libs glu`" "`pkg-config --libs glu`",
"-lpthread"
} }
-- windows library cflags and libs -- windows library cflags and libs