forked from 0ad/0ad
# Fix build issues by removing FCollada's bundled libxml2
On Windows, dynamically link to our standard libraries/libxml2/... implementation. This was SVN commit r7035.
This commit is contained in:
parent
cd0554c6bc
commit
f1b6b40adf
@ -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,
|
||||
})
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user