Permalink
Browse files

fix build scripts to build with common libs (ftoa and buffer)

fix gcc related issues
  • Loading branch information...
opencollada-sebastian committed Nov 16, 2009
1 parent 26d8994 commit 3dc5013870f28052d0fc865cfe208aab8cdaeb3d
@@ -12,6 +12,7 @@ for details please see LICENSE file or the website
#define __COLLADAFW_ARRAY_H__
#include "COLLADAFWPrerequisites.h"
+#include <cassert>
namespace COLLADAFW
@@ -14,6 +14,7 @@
#include "COLLADAFWPrerequisites.h"
#include <assert.h>
+#include <climits>
namespace COLLADAFW
{
@@ -12,6 +12,8 @@ targetPath = outputDir + libName
incDirs = ['include/',
+ '../common/libftoa/include/',
+ '../common/libBuffer/include/',
'../COLLADABaseUtils/include/']
src = [ variantDir + str(p) for p in Glob(srcDir + '*.cpp')]
@@ -25,9 +25,13 @@ libs = [ 'OpenCOLLADASaxFrameworkLoader',
'OpenCOLLADABaseUtils',
'GeneratedSaxParser',
'pcre',
+ 'ftoa',
+ 'buffer',
'UTF' ]
libPath = [ '../COLLADABaseUtils/' + env['libDir'] + env['configurationBaseName'],
+ '../common/libftoa/' + env['libDir'] + env['configurationBaseName'],
+ '../common/libBuffer/' + env['libDir'] + env['configurationBaseName'],
'../COLLADAFramework/' + env['libDir'] + env['configurationBaseName'],
'../Externals/MathMLSolver/' + env['libDir'] + env['configurationBaseName'],
'../Externals/UTF/' + env['libDir'] + env['configurationBaseName'],
@@ -50,10 +54,15 @@ else:
else:
libs += ['xml2']
+linkFlags = []
+
+
if env['PG']:
- linkFlags = ['-pg']
-else:
- linkFlags = []
+ linkFlags += ['-pg']
+
+if not env['SHAREDLIB']:
+ linkFlags += ['-static']
+
Program(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS'], LIBS=libs, LIBPATH=libPath, LINKFLAGS=linkFlags)
View
2 README
@@ -8,6 +8,8 @@ reduction of memory consumption and to much a better performance.
For more information about the plug-ins and how to build them, please read the README files in
COLLADAMax and COLLADAMaya directories.
+For information about how to build OpenCOLLADA under linux and mac OSX usings SCons, please read the BUILD file.
+
NOTE: The COLLADA.sln solution, contained in this directory, exists only for development purposes.
To build the NextGen plug-ins, please use the solutions in the COLLADAMax anf COLLADAMaya
directories.
View
@@ -56,6 +56,8 @@ env['libDir'] = 'lib/'
env['binDir'] = 'bin/'
+SConscript(['common/libftoa/SConscript'], exports = 'env')
+SConscript(['common/libBuffer/SConscript'], exports = 'env')
SConscript(['COLLADABaseUtils/SConscript'], exports = 'env')
SConscript(['Externals/MathMLSolver/SConscript'], exports = 'env')
SConscript(['Externals/UTF/SConscript'], exports = 'env')
@@ -75,6 +77,14 @@ SConscript(['COLLADASaxFrameworkLoader/SConscript'], exports = 'env')
SConscript(['COLLADAStreamWriter/SConscript'], exports = 'env')
SConscript(['COLLADAValidator/SConscript'], exports = 'env')
+SConscript(['dae2ogre/SConscript'], exports = 'env')
+
+
+Help("""
+The build process using scons allows you to set several options. All of the are
+explained above. However, not all combinations have been tested and some of them
+might not work. A list of teste combinations will be listed here in near future.
+""")
@@ -16,7 +16,7 @@ for details please see LICENSE file or the website
#include "DAE2OgreOgreWriter.h"
-#include "math/COLLADABUMathMatrix4.h"
+#include "Math/COLLADABUMathMatrix4.h"
namespace COLLADAFW
@@ -11,7 +11,7 @@ for details please see LICENSE file or the website
#include "DAE2OgreOgreWriter.h"
#include "DAE2OgreMeshWriter.h"
-#include "DAE2Ogrescenegraphwriter.h"
+#include "DAE2OgreSceneGraphWriter.h"
#include "COLLADASaxFWLLoader.h"
@@ -30,6 +30,9 @@ Torus Knot Software Ltd.
#include "DAE2OgreSerializer.h"
+#include <stdlib.h>
+#include <string.h>
+
namespace DAE2Ogre
{

0 comments on commit 3dc5013

Please sign in to comment.