Build test executable with same linker settings as game executable, to fix --without-fam
This was SVN commit r11661.
This commit is contained in:
parent
17c77ad2ac
commit
770ee1f30c
@ -1160,6 +1160,9 @@ function setup_tests()
|
||||
project_add_contents(source_root, {}, {}, extra_params)
|
||||
project_add_extern_libs(used_extern_libs, target_type)
|
||||
|
||||
-- TODO: should fix the duplication between this OS-specific linking
|
||||
-- code, and the similar version in setup_main_exe
|
||||
|
||||
if os.is("windows") then
|
||||
-- from "lowlevel" static lib; must be added here to be linked in
|
||||
files { source_root.."lib/sysdep/os/win/error_dialog.rc" }
|
||||
@ -1171,13 +1174,20 @@ function setup_tests()
|
||||
|
||||
project_add_manifest()
|
||||
|
||||
elseif os.is("linux") or os.is ("bsd") then
|
||||
elseif os.is("linux") or os.is("bsd") then
|
||||
|
||||
links {
|
||||
"fam",
|
||||
-- Utilities
|
||||
"rt",
|
||||
}
|
||||
if not _OPTIONS["without-fam"] then
|
||||
links { "fam" }
|
||||
end
|
||||
|
||||
if not _OPTIONS["android"] then
|
||||
links { "rt" }
|
||||
end
|
||||
|
||||
if _OPTIONS["android"] then
|
||||
-- NDK's STANDALONE-TOOLCHAIN.html says this is required
|
||||
linkoptions { "-Wl,--fix-cortex-a8" }
|
||||
end
|
||||
|
||||
if os.is("linux") then
|
||||
links {
|
||||
@ -1193,7 +1203,9 @@ function setup_tests()
|
||||
|
||||
-- Threading support
|
||||
buildoptions { "-pthread" }
|
||||
linkoptions { "-pthread" }
|
||||
if not _OPTIONS["android"] then
|
||||
linkoptions { "-pthread" }
|
||||
end
|
||||
|
||||
-- For debug_resolve_symbol
|
||||
configuration "Debug"
|
||||
|
Loading…
Reference in New Issue
Block a user