1
0
forked from 0ad/0ad

Updates some precompiled win32 libraries with VC++ 2010 (note: requires update-workspaces), refs #864:

Updates libiconv to v1.14.
Updates libxml2 to v2.9.1.
Updates zlib to v1.2.8.
Rebuilds FCollada.
Updates libxml2 to use same libiconv as tinygettext.
Cleans up unneeded libiconv files.

This was SVN commit r15416.
This commit is contained in:
historic_bruno 2014-06-23 01:07:16 +00:00
parent 600e8bd226
commit 213732d5af
2 changed files with 4 additions and 1 deletions

View File

@ -371,7 +371,7 @@ extern_lib_defs = {
add_default_lib_paths("iconv")
end
add_default_links({
win_names = { "iconv" },
win_names = { "libiconv" },
-- TODO: glibc provides symbols for this, so we should only include that (and depend on libiconv) on non-glibc unix
osx_names = { "iconv" },
dbg_suffix = "",

View File

@ -1069,6 +1069,7 @@ function setup_atlas_projects()
"../../../third_party/jsonspirit"
},{ -- extern_libs
"boost",
"iconv",
"libxml2",
"wxwidgets"
},{ -- extra_params
@ -1112,6 +1113,7 @@ function setup_atlas_projects()
"boost",
"comsuppw",
--"ffmpeg", -- disabled for now because it causes too many build difficulties
"iconv",
"libxml2",
"sdl", -- key definitions
"wxwidgets",
@ -1255,6 +1257,7 @@ function setup_collada_projects()
},{ -- include
},{ -- extern_libs
"fcollada",
"iconv",
"libxml2"
},{ -- extra_params
})