Attention une mise à jour du serveur va être effectuée le vendredi 16 avril entre 12h et 12h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit 10560b87 authored by Laurent Belcour's avatar Laurent Belcour

Got all the library to compile under MacOS. The vtable issue still remains.

parent d4b8f010
......@@ -97,10 +97,10 @@ env.AppendUnique(CPPPATH = ['#sources'])
##l
Export('env')
external = env.SConscript('external/SConscript')
#core = env.SConscript('sources/core/SConscript')
#plugins = env.SConscript('sources/plugins/SConscript')
#softs = env.SConscript('sources/softs/SConscript')
env.SConscript(dirs=['sources/core', 'sources/softs', 'sources/plugins'])
#external = env.SConscript('external/SConscript')
core = env.SConscript('sources/core/SConscript')
plugins = env.SConscript('sources/plugins/SConscript')
softs = env.SConscript('sources/softs/SConscript')
#env.SConscript(dirs=['sources/core', 'sources/softs', 'sources/plugins'])
#env.NoClean(external)
import os, sys
##----------------------------------------------------------------##
## This file describes required and optional arguments to ALTA ##
## compilation. If you want to manualy tune the use of an already ##
## present library, uncomment the according lines. ##
##----------------------------------------------------------------##
## Compilators build flags
##
CXX = 'g++'
CCFLAGS = ['-O3', '-Wall', '-m64']
LINKFLAGS = []
## OpenMP flags
##
OPENMP_FLAGS = ['-fopenmp']
OPENMP_LIBS = ['gomp']
## OpenEXR library
##
#OPENEXR_INC = ['/usr/include/OpenEXR']
#OPENEXR_DIR = ['/usr/lib']
#OPENEXR_LIB = ['Half', 'IlmImf', 'IlmThread']
## QUADPROG library
##
## You have to specify the directory of the QuadProg library
##
QUADPROG_INC = ['#external/quadprog++']
QUADPROG_DIR = ['#external/build/lib']
QUADPROG_LIBS = ['quadprog++']
## CERES library
##
## You have to specify both the directory of the CERES library
## and the glog library
##
CERES_INC = ['#external/build/include']
CERES_DIR = ['#external/build/lib']
CERES_LIBS = ['ceres', 'glog']
CERES_OPT_LIBS = ['gomp', 'lapack', 'blas']
## NlOpt library
##
## You have to specify the directory of the NlOpt library
##
NLOPT_INC = ['#external/build/include']
NLOPT_DIR = ['#external/build/lib']
NLOPT_LIBS = ['nlopt']
NLOPT_OPT_LIBS = []
## coin IpOpt library
##
## You have to specify the directory of the IpOpt library
##
IPOPT_INC = ['#external/build/include']
IPOPT_DIR = ['#external/build/lib']
IPOPT_LIBS = ['ipopt']
IPOPT_OPT_LIBS = []
## MATLAB library and Engine
##
# EXAMPLE FOR MAC
#MATLAB_INC = [' /Applications/MATLAB_R2014a.app/extern/include/']
#MATLAB_DIR = [ '/Applications/MATLAB_R2014a.app/bin/maci64/']
#MATLAB_LIBS = ['eng', 'mex','mat']
......@@ -14,15 +14,15 @@ import os, sys
## Compilators build flags
##
CXX = 'clang'
CCFLAGS = ['-O3', '-Wall', '-m64']
LINKFLAGS = []
CCFLAGS = ['-O3', '-Wall', '-Xarch_x86_64', '-mmacosx-version-min=10.9']
LINKFLAGS = ['-headerpad_max_install_names', '-Xarch_x86_64', '-mmacosx-version-min=10.9']
## ALTA internal flags
##
CORE_LIB = ['dl', 'stdc++']
SOFT_LIB = ['core', 'dl', 'stdc++']
PLUGIN_LIB = ['core']
PLUGIN_LIB = ['core', 'stdc++']
## OpenMP flags
......
......@@ -50,6 +50,11 @@ struct ptr_counter
unsigned int _count;
};
template<class T> class ptr;
template<class T, class U>
ptr<U> dynamic_pointer_cast(const ptr<T>& ptr_t);
template<class T> class ptr
{
public:
......@@ -125,4 +130,6 @@ template<class T> class ptr
};
#endif
Import('env')
env = env.Clone()
env.AppendUnique(LIBS = env['PLUGIN_LIB'])
sources = ['function.cpp']
libs = ['core']
env.SharedLibrary('../../build/nonlinear_fresnel_retroschlick', sources, LIBS=libs)
env.SharedLibrary('../../build/nonlinear_fresnel_retroschlick', sources)
Import('env')
env = env.Clone()
env.AppendUnique(LIBS = env['PLUGIN_LIB'])
sources = ['rational_fitter.cpp']
libs = ['core']
env.SharedLibrary('../../build/rational_fitter_eigen', sources, LIBS=libs)
env.SharedLibrary('../../build/rational_fitter_eigen', sources)
Import('env')
env = env.Clone()
env.AppendUnique(LIBS = env['PLUGIN_LIB'])
sources = ['rational_fitter.cpp']
libs = ['core']
env.SharedLibrary('../../build/rational_fitter_leastsquare', sources, LIBS=libs)
env.SharedLibrary('../../build/rational_fitter_leastsquare', sources)
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