Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

# Fix build issues by removing FCollada's bundled libxml2

Browse Source 
On Windows, dynamically link to our standard libraries/libxml2/...
implementation.

This was SVN commit r7035.
This commit is contained in:
Ykkrosh 2009-07-26 09:48:10 +00:00
parent cd0554c6bc
commit f1b6b40adf
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/premake/premake.lua
View File

@ -853,10 +853,6 @@ function setup_collada_package(package_name, target_type, rel_source_dirs, rel_i
if extra_params["extra_links"] then
listconcat(package.links, extra_params["extra_links"])
end
else
tinsert(package.buildoptions, "`pkg-config libxml-2.0 --cflags`")
tinsert(package.linkoptions, "`pkg-config libxml-2.0 --libs`")
end
if OS == "linux" then
@ -883,6 +879,7 @@ function setup_collada_packages()
},{ -- extern_libs
"fcollada",
"dl",
"libxml2",
},{ -- extra_params
pch = 1,
})

8
source/collada/CommonConvert.cpp
View File

@ -101,13 +101,7 @@ void FColladaDocument::LoadFromText(const char *text)
bool status = FCollada::LoadDocumentFromMemory("unknown.dae", document.get(), (void*)newText, newTextSize);
if (newText != text)
{
// It'd be nice to use xmlFree, but for some reason (?) it causes
// linker errors in MSVC. So get access to it an ugly way:
xmlFreeFunc freeFunc;
xmlMemGet(&freeFunc, NULL, NULL, NULL);
freeFunc((void*)newText);
}
xmlFree((void*)newText);
REQUIRE_SUCCESS(status);
}