Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
alta
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alta
alta
Commits
10560b87
Commit
10560b87
authored
Jun 09, 2014
by
Laurent Belcour
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Got all the library to compile under MacOS. The vtable issue still remains.
parent
d4b8f010
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
90 deletions
+23
-90
SConstruct
SConstruct
+5
-5
config.example
config.example
+0
-76
configs/scons/config-macos-clang.py
configs/scons/config-macos-clang.py
+3
-3
sources/core/ptr.h
sources/core/ptr.h
+7
-0
sources/plugins/nonlinear_fresnel_retroschlick/SConscript
sources/plugins/nonlinear_fresnel_retroschlick/SConscript
+3
-2
sources/plugins/rational_fitter_eigen/SConscript
sources/plugins/rational_fitter_eigen/SConscript
+2
-2
sources/plugins/rational_fitter_leastsquare/SConscript
sources/plugins/rational_fitter_leastsquare/SConscript
+3
-2
No files found.
SConstruct
View file @
10560b87
...
...
@@ -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)
config.example
deleted
100644 → 0
View file @
d4b8f010
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']
configs/scons/config-macos-clang.py
View file @
10560b87
...
...
@@ -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
...
...
sources/core/ptr.h
View file @
10560b87
...
...
@@ -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
sources/plugins/nonlinear_fresnel_retroschlick/SConscript
View file @
10560b87
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
)
sources/plugins/rational_fitter_eigen/SConscript
View file @
10560b87
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
)
sources/plugins/rational_fitter_leastsquare/SConscript
View file @
10560b87
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
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment