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:
parent
e6b675bb9a
commit
ea7bfbee70
@ -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"
|
||||||
@ -130,7 +131,7 @@ project "RecastDemo"
|
|||||||
"../DetourTileCache/Include",
|
"../DetourTileCache/Include",
|
||||||
"../Recast/Include"
|
"../Recast/Include"
|
||||||
}
|
}
|
||||||
files {
|
files {
|
||||||
"../RecastDemo/Include/*.h",
|
"../RecastDemo/Include/*.h",
|
||||||
"../RecastDemo/Source/*.cpp",
|
"../RecastDemo/Source/*.cpp",
|
||||||
"../RecastDemo/Contrib/fastlz/*.h",
|
"../RecastDemo/Contrib/fastlz/*.h",
|
||||||
@ -138,7 +139,7 @@ project "RecastDemo"
|
|||||||
}
|
}
|
||||||
|
|
||||||
-- project dependencies
|
-- project dependencies
|
||||||
links {
|
links {
|
||||||
"DebugUtils",
|
"DebugUtils",
|
||||||
"Detour",
|
"Detour",
|
||||||
"DetourCrowd",
|
"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,8 +239,8 @@ 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`",
|
||||||
"`pkg-config --cflags glu`",
|
"`pkg-config --cflags glu`",
|
||||||
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user