Fix libpath ordering
This was SVN commit r7105.
This commit is contained in:
parent
43950c2fde
commit
6857e34555
@ -17,7 +17,9 @@ local function add_extern_lib_paths(extern_lib)
|
|||||||
-- windows or processing one of those libs.
|
-- windows or processing one of those libs.
|
||||||
if OS == "windows" or extern_lib == "cxxtest" or extern_lib == "fcollada" or extern_lib == "valgrind" or extern_lib == "spidermonkey" then
|
if OS == "windows" or extern_lib == "cxxtest" or extern_lib == "fcollada" or extern_lib == "valgrind" or extern_lib == "spidermonkey" then
|
||||||
tinsert(package.includepaths, libraries_dir .. extern_lib .. "/include")
|
tinsert(package.includepaths, libraries_dir .. extern_lib .. "/include")
|
||||||
tinsert(package.libpaths, libraries_dir .. extern_lib .. "/lib")
|
-- Insert libs at pos=1 (i.e. the front of the list) so they take
|
||||||
|
-- precedence over system libraries
|
||||||
|
tinsert(package.libpaths, 1, libraries_dir .. extern_lib .. "/lib")
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
@ -1026,7 +1026,6 @@ function setup_tests()
|
|||||||
package.config["Testing"].linkoptions = { "-rdynamic" }
|
package.config["Testing"].linkoptions = { "-rdynamic" }
|
||||||
|
|
||||||
tinsert(package.includepaths, source_root .. "pch/test/")
|
tinsert(package.includepaths, source_root .. "pch/test/")
|
||||||
tinsert(package.libpaths, "/usr/X11R6/lib")
|
|
||||||
end
|
end
|
||||||
|
|
||||||
package_setup_pch(
|
package_setup_pch(
|
||||||
|
Loading…
Reference in New Issue
Block a user