1
0
forked from 0ad/0ad

This was SVN commit r10084.

This commit is contained in:
historic_bruno 2011-08-24 02:54:31 +00:00
parent 85336397a3
commit 37dad6eb62

View File

@ -81,16 +81,13 @@ local function add_delayload(name, suffix, def)
-- no extra debug version; use same library in all configs
if suffix == "" then
linkoptions { "/DELAYLOAD:"..name..".dll" }
-- extra debug version available; use in debug/testing config
-- extra debug version available; use in debug config
else
local dbg_cmd = "/DELAYLOAD:" .. name .. suffix .. ".dll"
local cmd = "/DELAYLOAD:" .. name .. ".dll"
configuration "Debug"
linkoptions { dbg_cmd }
-- 'Testing' config uses 'Debug' DLLs
configuration "Testing"
linkoptions { dbg_cmd }
configuration "Release"
linkoptions { cmd }
configuration { }
@ -136,9 +133,6 @@ local function add_default_links(def)
for i,name in pairs(names) do
configuration "Debug"
links { name .. suffix }
-- 'Testing' config uses 'Debug' DLLs
configuration "Testing"
links { name .. suffix }
configuration "Release"
links { name }
configuration { }
@ -295,16 +289,12 @@ extern_lib_defs = {
if os.is("windows") then
configuration "Debug"
links { "FColladaD" }
configuration "Testing"
links { "FCollada" }
configuration "Release"
links { "FCollada" }
configuration { }
else
configuration "Debug"
links { "FColladaSD" }
configuration "Testing"
links { "FColladaSR" }
configuration "Release"
links { "FColladaSR" }
configuration { }
@ -394,8 +384,6 @@ extern_lib_defs = {
add_default_lib_paths("libxml2")
configuration "Debug"
links { "libxml2" }
configuration "Testing"
links { "libxml2" }
configuration "Release"
links { "libxml2" }
configuration { }
@ -487,8 +475,6 @@ extern_lib_defs = {
end
configuration "Debug"
includedirs { libraries_dir.."spidermonkey/"..include_dir }
configuration "Testing"
includedirs { libraries_dir.."spidermonkey/"..include_dir }
configuration "Release"
includedirs { libraries_dir.."spidermonkey/"..include_dir }
configuration { }
@ -496,8 +482,6 @@ extern_lib_defs = {
link_settings = function()
configuration "Debug"
links { "mozjs185-ps-debug" }
configuration "Testing"
links { "mozjs185-ps-debug" }
configuration "Release"
links { "mozjs185-ps-release" }
configuration { }
@ -543,8 +527,6 @@ extern_lib_defs = {
libdirs { libraries_dir.."wxwidgets/lib/vc_lib" }
configuration "Debug"
links { "wxmsw28ud_gl" }
configuration "Testing"
links { "wxmsw28ud_gl" }
configuration "Release"
links { "wxmsw28u_gl" }
configuration { }
@ -631,9 +613,6 @@ function project_add_extern_libs(extern_libs, target_type)
configuration "Debug"
includedirs { "/opt/local/include" }
libdirs { "/opt/local/lib" }
configuration "Testing"
includedirs { "/opt/local/include" }
libdirs { "/opt/local/lib" }
configuration "Release"
includedirs { "/opt/local/include" }
libdirs { "/opt/local/lib" }