diff options
Diffstat (limited to 'extern/solid/SConscript')
| -rw-r--r-- | extern/solid/SConscript | 75 |
1 files changed, 16 insertions, 59 deletions
diff --git a/extern/solid/SConscript b/extern/solid/SConscript index 00402d640e8..673a9951ea4 100644 --- a/extern/solid/SConscript +++ b/extern/solid/SConscript @@ -1,29 +1,23 @@ #!/usr/bin/python import sys -import os -solid_env = Environment(ENV = os.environ) +Import('env') -# Import the C flags set in the SConstruct file -Import ('cflags') -#Import ('cxxflags') -#Import ('defines') -Import ('user_options_dict') -#defines = ['QHULL', '_LIB'] -defines = ['USE_DOUBLES','QHULL', '_LIB'] -#cflags = [] -cxxflags = [] +defs = 'USE_DOUBLES QHULL _LIB' +cflags = [] -if sys.platform=='win32': - defines += ['WIN32','NDEBUG', '_WINDOWS', '_LIB'] - #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op'] - cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6'] +if env['OURPLATFORM']=='win32-vc': + defs += ' WIN32 NDEBUG _WINDOWS _LIB' + cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6'] +elif env['OURPLATFORM']=='win32-mingw': + defs += ' NDEBUG' + cflags += ['-O2'] elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5': - defines += ['NDEBUG'] - cflags += ['-O2'] + defs += ' NDEBUG' + cflags += ['-O2'] elif sys.platform=='darwin' : - defines += ['NDEBUG'] - cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4'] + defs += ' NDEBUG' + cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4'] else: print "################################################" @@ -33,45 +27,8 @@ else: print "and cflags / cxxflags to the" print "extern/solid/SConscript file" -solid_env.Append (CCFLAGS = cflags) -solid_env.Append (CPPFLAGS = cxxflags) +sources = env.Glob('src/*.cpp') + env.Glob('src/convex/*.cpp') + env.Glob('src/complex/*.cpp') + env.Glob('src/broad/*.cpp') -solid_env.Append (CPPDEFINES = defines) +incs = 'include src src/broad src/complex src/convex ../qhull/include' -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) +env.BlenderLib ( libname='extern_solid', sources=sources, includes=Split(incs), defines=Split(defs), libtype='game2', priority=45 , compileflags = cflags) |