From 6857e34555c1b0fe04a5b4b813fc1a4a537d9214 Mon Sep 17 00:00:00 2001 From: Ykkrosh Date: Mon, 10 Aug 2009 22:38:51 +0000 Subject: [PATCH] Fix libpath ordering This was SVN commit r7105. --- build/premake/extern_libs.lua | 4 +++- build/premake/premake.lua | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/premake/extern_libs.lua b/build/premake/extern_libs.lua index 6205018228..1fb9b28129 100644 --- a/build/premake/extern_libs.lua +++ b/build/premake/extern_libs.lua @@ -17,7 +17,9 @@ local function add_extern_lib_paths(extern_lib) -- 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 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 diff --git a/build/premake/premake.lua b/build/premake/premake.lua index 3dfdeeba5d..41ae2e9883 100755 --- a/build/premake/premake.lua +++ b/build/premake/premake.lua @@ -1026,7 +1026,6 @@ function setup_tests() package.config["Testing"].linkoptions = { "-rdynamic" } tinsert(package.includepaths, source_root .. "pch/test/") - tinsert(package.libpaths, "/usr/X11R6/lib") end package_setup_pch(