diff options
Diffstat (limited to 'extern/qhull/SConscript')
-rw-r--r-- | extern/qhull/SConscript | 54 |
1 files changed, 25 insertions, 29 deletions
diff --git a/extern/qhull/SConscript b/extern/qhull/SConscript index 927ca3a6a0d..2d767cfc58d 100644 --- a/extern/qhull/SConscript +++ b/extern/qhull/SConscript @@ -2,38 +2,34 @@ import sys import os -qhull_env = Environment(ENV = os.environ) - -# Import the C flags set in the SConstruct file -Import ('cflags') -Import ('defines') -Import ('user_options_dict') +Import('env') +defs = '' +cflags = [] if sys.platform=='linux2' or sys.platform=='linux-i386': - qhull_env.Append (CCFLAGS = ['-O2', '-ansi']) -elif sys.platform=='win32': - qhull_env.Append (CCFLAGS = ['/O2']) + cflags += ['-O2','-ansi'] +elif env['OURPLATFORM']=='win32-vc': + cflags += ['/O2'] +elif env['OURPLATFORM']=='win32-mingw': + cflags += ['-O2'] elif sys.platform=='sunos': - qhull_env.Append (CCFLAGS = ['Xc', '-v', '-fast']) + cflags += ['Xc', '-v', '-fast'] elif sys.platform=='darwin': - qhull_env.Append (CCFLAGS = ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4']) -else: - qhull_env.Append (CCFLAGS = cflags) -qhull_env.Append (CPPDEFINES = defines) + cflags += ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4'] + +sources = ['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'] -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']) +incs = 'include src' -qhull_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/extern_qhull', source=source_files) +env.BlenderLib ( 'extern_qhull', sources, Split(incs), Split(defs), libtype='game2', priority=50, compileflags = cflags) |