sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Made ldl code a part of extern_ssba library, otherwise gcc fails to

Browse Source 
find ldl symbols because order of libraries seems to be critical
for gcc linker.

A bit stupid, but that's how linker works..

Both CMake and SCons shall work fine on linux now.
This commit is contained in:
Sergey Sharybin 2013-02-20 12:07:27 +00:00
parent 705d2ab417
commit ea99b9a392
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extern/libmv/CMakeLists.txt vendored
View File

@ -35,7 +35,6 @@ set(INC
set(INC_SYS
../Eigen3
third_party/ssba
third_party/ldl/Include
${PNG_INCLUDE_DIR}
${ZLIB_INCLUDE_DIRS}
)
@ -83,7 +82,6 @@ set(SRC
third_party/gflags/gflags.cc
third_party/gflags/gflags_completions.cc
third_party/gflags/gflags_reporting.cc
third_party/ldl/Source/ldl.c
libmv-capi.h
libmv/base/id_generator.h
@ -141,7 +139,6 @@ set(SRC
third_party/gflags/gflags/gflags.h
third_party/gflags/mutex.h
third_party/gflags/util.h
third_party/ldl/Include/ldl.h
third_party/msinttypes/inttypes.h
third_party/msinttypes/stdint.h
)

3
extern/libmv/SConscript vendored
View File

@ -22,7 +22,6 @@ src += env.Glob('libmv/simple_pipeline/*.cc')
src += env.Glob('libmv/tracking/*.cc')
src += env.Glob('third_party/fast/*.c')
src += env.Glob('third_party/gflags/*.cc')
src += env.Glob('third_party/ldl/Source/*.c')
incs = '. ../Eigen3 third_party/ceres/include'
incs += ' ' + env['BF_PNG_INC']
@ -39,7 +38,7 @@ else:
src += env.Glob("third_party/glog/src/*.cc")
incs += ' ./third_party/glog/src'
incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
incs += ' ./third_party/ssba ../colamd/Include'
env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137] )

3
extern/libmv/third_party/ssba/CMakeLists.txt vendored
View File

@ -42,6 +42,9 @@ set(SRC
Math/v3d_linear_utils.h
Math/v3d_mathutilities.h
Math/v3d_optimization.h
../ldl/Source/ldl.c
../ldl/Include/ldl.h
)
if(WIN32)

1
extern/libmv/third_party/ssba/SConscript vendored
View File

@ -15,6 +15,7 @@ defs.append('V3DLIB_ENABLE_SUITESPARSE')
src = env.Glob('Geometry/*.cpp')
src += env.Glob('Math/*.cpp')
src += env.Glob('../ldl/Source/*.c')
incs = '. ../ldl/Include ../../../colamd/Include'

2
source/creator/CMakeLists.txt
View File

@ -923,8 +923,8 @@ endif()
if(WITH_LIBMV)
list(APPEND BLENDER_SORTED_LIBS extern_libmv)
list(APPEND BLENDER_SORTED_LIBS extern_ceres)
list(APPEND BLENDER_SORTED_LIBS extern_ssba)
list(APPEND BLENDER_SORTED_LIBS extern_ceres)
endif()
if(WITH_MOD_CLOTH_ELTOPO)