Commit d8c37a9a authored by Laurent Belcour's avatar Laurent Belcour

Updating of the Scons scripts

parent 35653337
...@@ -17,6 +17,7 @@ if not os.path.exists(configFile): ...@@ -17,6 +17,7 @@ if not os.path.exists(configFile):
vars = Variables(configFile) vars = Variables(configFile)
vars.Add('CXX', 'Compiler') vars.Add('CXX', 'Compiler')
vars.Add('CCFLAGS', 'Compiler\'s flags') vars.Add('CCFLAGS', 'Compiler\'s flags')
vars.Add('LINKLAGS', 'Linker\'s flags')
vars.Add('OPENEXR_INC', 'OpenEXR include directory') vars.Add('OPENEXR_INC', 'OpenEXR include directory')
vars.Add('OPENEXR_DIR', 'OpenEXR libraries directory') vars.Add('OPENEXR_DIR', 'OpenEXR libraries directory')
vars.Add('OPENEXR_LIBS', 'OpenEXR libraries') vars.Add('OPENEXR_LIBS', 'OpenEXR libraries')
......
...@@ -11,6 +11,7 @@ import os, sys ...@@ -11,6 +11,7 @@ import os, sys
## ##
CXX = 'g++' CXX = 'g++'
CCFLAGS = ['-O3', '-g', '-Wall', '-m64'] CCFLAGS = ['-O3', '-g', '-Wall', '-m64']
LINKFLAGS = []
## OpenMP flags ## OpenMP flags
......
...@@ -13,7 +13,7 @@ else: ...@@ -13,7 +13,7 @@ else:
## ##
# CERES dependancies # CERES dependancies
## ##
if env['CERES_INC'] == '#external/build/include' and env['CERES_LIB'] == '#external/build/lib': if env['CERES_INC'] == ['#external/build/include'] and env['CERES_DIR'] == ['#external/build/lib']:
execfile('obtain_ceres.py') execfile('obtain_ceres.py')
#end #end
......
...@@ -17,6 +17,7 @@ if not os.path.exists(configFile): ...@@ -17,6 +17,7 @@ if not os.path.exists(configFile):
vars = Variables(configFile) vars = Variables(configFile)
vars.Add('CXX', 'Compiler') vars.Add('CXX', 'Compiler')
vars.Add('CCFLAGS', 'Compiler\'s flags') vars.Add('CCFLAGS', 'Compiler\'s flags')
vars.Add('LINKFLAGS', 'Linker\'s flags')
vars.Add('OPENEXR_INC', 'OpenEXR include directory') vars.Add('OPENEXR_INC', 'OpenEXR include directory')
vars.Add('OPENEXR_DIR', 'OpenEXR libraries directory') vars.Add('OPENEXR_DIR', 'OpenEXR libraries directory')
vars.Add('OPENEXR_LIBS', 'OpenEXR libraries') vars.Add('OPENEXR_LIBS', 'OpenEXR libraries')
......
...@@ -18,4 +18,4 @@ if(os.name == 'posix'): ...@@ -18,4 +18,4 @@ if(os.name == 'posix'):
libs = ['rt', 'dl'] libs = ['rt', 'dl']
#end #end
env.StaticLibrary('../build/core', sources, LIBS=libs) env.StaticLibrary('../build/core', sources, LIBS=libs, LINKFLAGS=['-shared'])
env = Environment() Import('env')
env.Append(CPPPATH = ['../../../external/build/include', '../../']) env = env.Clone()
env.Append(LIBPATH = ['../../../external/build/lib', '../../build'])
sources = ['rational_fitter.cpp'] sources = ['rational_fitter.cpp']
libs = ['core'] libs = ['core']
env.SharedLibrary('../../build/rational_fitter_eigen', sources, LIBS=libs) env.SharedLibrary('../../build/rational_fitter_eigen', sources, LIBS=libs, LINKFLAGS=['-shared'])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment