diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2004-03-10 00:14:03 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2004-03-10 00:14:03 +0300 |
commit | 3081f4a6355b495f167151fb269dd16fa4f9f24e (patch) | |
tree | 70771e8a426f71e9d2dc5bdfebdf84e55e064683 /extern | |
parent | a2dc5f8f8ed3dd6967e7bdb12f50799b80252a6a (diff) |
- [SCONS] Added building of qhull and Solid from extern when selecting the Solid gameengine. The gameengine has not been updated with the Tuhopuu2 one, so it is not wise to do that yet. This is in preparation for that and won't effect the current build process.
Diffstat (limited to 'extern')
-rw-r--r-- | extern/SConscript | 2 | ||||
-rw-r--r-- | extern/qhull/SConscript | 26 | ||||
-rw-r--r-- | extern/solid/SConscript | 65 |
3 files changed, 93 insertions, 0 deletions
diff --git a/extern/SConscript b/extern/SConscript new file mode 100644 index 00000000000..180c41b5c40 --- /dev/null +++ b/extern/SConscript @@ -0,0 +1,2 @@ +SConscript(['qhull/SConscript', + 'solid/SConscript'])
\ No newline at end of file diff --git a/extern/qhull/SConscript b/extern/qhull/SConscript new file mode 100644 index 00000000000..3af54e31e62 --- /dev/null +++ b/extern/qhull/SConscript @@ -0,0 +1,26 @@ +qhull_env = Environment() + +# Import the C flags set in the SConstruct file +Import ('cflags') +Import ('defines') +Import ('user_options_dict') +qhull_env.Append (CCFLAGS = cflags) +qhull_env.Append (CPPDEFINES = defines) + +source_files = ['src/geom.c', + 'src/geom2.c', + 'src/global.c', + 'src/io.c', + 'src/mem.c', + 'src/merge.c', + 'src/poly.c', + 'src/poly2.c', + 'src/qhull.c', + 'src/qset.c', + 'src/stat.c', + 'src/user.c'] + +qhull_env.Append (CPPPATH = ['include', + 'src']) + +qhull_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/extern_qhull', source=source_files) diff --git a/extern/solid/SConscript b/extern/solid/SConscript new file mode 100644 index 00000000000..e23da8f59ee --- /dev/null +++ b/extern/solid/SConscript @@ -0,0 +1,65 @@ +import sys +solid_env = Environment() + +# Import the C flags set in the SConstruct file +#Import ('cflags') +#Import ('cxxflags') +#Import ('defines') +Import ('user_options_dict') +defines = ['USE_DOUBLES','QHULL', '_LIB'] +cflags = [] +cxxflags = [] + +if sys.platform=='win32': + defines += ['WIN32','NDEBUG', '_WINDOWS', '_LIB'] + cflags += ['/MT', '/W3', '/GX', '/O2'] +else: + print "################################################" + print + print "Check if solid builds on your platform correctly" + print "Add your platform specific defines" + print "and cflags / cxxflags to the" + print "extern/solid/SConscript file" + +solid_env.Append (CCFLAGS = cflags) +solid_env.Append (CPPFLAGS = cxxflags) + +solid_env.Append (CPPDEFINES = defines) + +solid_sources = ['src/DT_C-api.cpp', + 'src/DT_Encounter.cpp', + 'src/DT_Object.cpp', + 'src/DT_RespTable.cpp', + 'src/DT_Scene.cpp'] + +convex_sources = ['src/convex/DT_Accuracy.cpp', + 'src/convex/DT_Box.cpp', + 'src/convex/DT_Cone.cpp', + 'src/convex/DT_Convex.cpp', + 'src/convex/DT_Cylinder.cpp', + 'src/convex/DT_Facet.cpp', + 'src/convex/DT_LineSegment.cpp', + 'src/convex/DT_PenDepth.cpp', + 'src/convex/DT_Point.cpp', + 'src/convex/DT_Polyhedron.cpp', + 'src/convex/DT_Polytope.cpp', + 'src/convex/DT_Sphere.cpp', + 'src/convex/DT_Triangle.cpp'] + +complex_sources = ['src/complex/DT_BBoxTree.cpp', + 'src/complex/DT_Complex.cpp'] + +broad_sources = ['src/broad/BP_C-api.cpp', + 'src/broad/BP_EndpointList.cpp', + 'src/broad/BP_Proxy.cpp', + 'src/broad/BP_Scene.cpp'] + +solid_env.Append (CPPPATH = ['include', + 'src', + 'src/broad', + 'src/complex', + 'src/convex', + '../qhull/include']) +source_files = solid_sources + convex_sources + complex_sources + broad_sources + +solid_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/extern_solid', source=source_files) |