forked from 0ad/0ad
GCC compatibility for COLLADA converter
This was SVN commit r4683.
This commit is contained in:
parent
0caac67fe2
commit
da266ebcb8
@ -64,6 +64,7 @@ extern_lib_defs = {
|
||||
},
|
||||
fcollada = {
|
||||
win_names = { "FColladaS" },
|
||||
unix_names = { "FCollada" },
|
||||
dbg_suffix = "D",
|
||||
no_delayload = 1,
|
||||
},
|
||||
|
@ -640,6 +640,10 @@ function setup_collada_package(package_name, target_type, rel_source_dirs, rel_i
|
||||
end
|
||||
|
||||
else -- Non-Windows, = Unix
|
||||
tinsert(package.defines, "LINUX");
|
||||
tinsert(package.includepaths, "/usr/include/libxml2")
|
||||
tinsert(package.links, "xml2")
|
||||
|
||||
tinsert(package.buildoptions, "-rdynamic")
|
||||
tinsert(package.linkoptions, "-rdynamic")
|
||||
end
|
||||
|
@ -147,7 +147,7 @@ public:
|
||||
float* position, float* normal, float* texcoord,
|
||||
VertexBlend* boneWeights, BoneTransform* boneTransforms)
|
||||
{
|
||||
static const VertexBlend noBlend = { 0xFF, 0xFF, 0xFF, 0xFF, 0, 0, 0, 0 };
|
||||
static const VertexBlend noBlend = { { 0xFF, 0xFF, 0xFF, 0xFF }, { 0, 0, 0, 0 } };
|
||||
|
||||
assert(position);
|
||||
assert(normal);
|
||||
|
@ -8,9 +8,20 @@ class ColladaException : public std::exception
|
||||
{
|
||||
public:
|
||||
ColladaException(const std::string& msg)
|
||||
: std::exception(msg.c_str())
|
||||
: msg(msg)
|
||||
{
|
||||
}
|
||||
|
||||
~ColladaException() throw()
|
||||
{
|
||||
}
|
||||
|
||||
virtual const char* what() const throw()
|
||||
{
|
||||
return msg.c_str();
|
||||
}
|
||||
private:
|
||||
std::string msg;
|
||||
};
|
||||
|
||||
void ColladaToPMD(const char* input, OutputFn output, std::string& xmlErrors);
|
||||
|
Loading…
Reference in New Issue
Block a user