remove unmaintained eltopo, keeping scons/cmake entries, but commenting out user visible config to make branch merging less of a hassle.
This commit is contained in:
parent
7c36100930
commit
a7555a81c7
|
@ -190,8 +190,8 @@ option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON)
|
|||
option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON)
|
||||
option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
|
||||
option(WITH_MOD_REMESH "Enable Remesh Modifier" ON)
|
||||
option(WITH_MOD_CLOTH_ELTOPO "Enable Experimental cloth solver" OFF)
|
||||
mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
|
||||
# option(WITH_MOD_CLOTH_ELTOPO "Enable Experimental cloth solver" OFF) # this is now only available in a branch
|
||||
# mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
|
||||
option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
|
||||
|
||||
# Image format support
|
||||
|
|
|
@ -166,10 +166,12 @@ def setup_staticlibs(lenv):
|
|||
libincs += Split(lenv['BF_FFTW3_LIBPATH'])
|
||||
if lenv['WITH_BF_STATICFFTW3']:
|
||||
statlibs += Split(lenv['BF_FFTW3_LIB_STATIC'])
|
||||
'''
|
||||
if lenv['WITH_BF_ELTOPO']:
|
||||
libincs += Split(lenv['BF_LAPACK_LIBPATH'])
|
||||
if lenv['WITH_BF_STATICLAPACK']:
|
||||
statlibs += Split(lenv['BF_LAPACK_LIB_STATIC'])
|
||||
statlibs += Split(lenv['BF_LAPACK_LIB_STATIC'])
|
||||
'''
|
||||
if lenv['WITH_BF_FFMPEG'] and lenv['WITH_BF_STATICFFMPEG']:
|
||||
statlibs += Split(lenv['BF_FFMPEG_LIB_STATIC'])
|
||||
if lenv['WITH_BF_INTERNATIONAL']:
|
||||
|
@ -293,8 +295,10 @@ def setup_syslibs(lenv):
|
|||
syslibs += Split(lenv['BF_SNDFILE_LIB'])
|
||||
if lenv['WITH_BF_FFTW3'] and not lenv['WITH_BF_STATICFFTW3']:
|
||||
syslibs += Split(lenv['BF_FFTW3_LIB'])
|
||||
'''
|
||||
if lenv['WITH_BF_ELTOPO']:
|
||||
syslibs += Split(lenv['BF_LAPACK_LIB'])
|
||||
'''
|
||||
if lenv['WITH_BF_SDL']:
|
||||
syslibs += Split(lenv['BF_SDL_LIB'])
|
||||
if not lenv['WITH_BF_STATICOPENGL']:
|
||||
|
|
|
@ -119,7 +119,8 @@ def validate_arguments(args, bc):
|
|||
'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH',
|
||||
'WITH_BF_GAMEENGINE',
|
||||
'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
|
||||
'WITH_BF_ELTOPO', 'BF_LAPACK', 'BF_LAPACK_LIB', 'BF_LAPACK_LIBPATH', 'BF_LAPACK_LIB_STATIC',
|
||||
# 'WITH_BF_ELTOPO', # now only available in a branch
|
||||
'BF_LAPACK', 'BF_LAPACK_LIB', 'BF_LAPACK_LIBPATH', 'BF_LAPACK_LIB_STATIC',
|
||||
'BF_WINTAB', 'BF_WINTAB_INC',
|
||||
'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', 'BF_FREETYPE_LIB_STATIC', 'WITH_BF_FREETYPE_STATIC',
|
||||
'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH',
|
||||
|
@ -393,8 +394,7 @@ def read_opts(env, cfg, args):
|
|||
(BoolVariable('WITH_BF_GAMEENGINE', 'Build with gameengine' , False)),
|
||||
|
||||
(BoolVariable('WITH_BF_BULLET', 'Use Bullet if true', True)),
|
||||
|
||||
(BoolVariable('WITH_BF_ELTOPO', 'Use Eltopo collision library if true', False)),
|
||||
# (BoolVariable('WITH_BF_ELTOPO', 'Use Eltopo collision library if true', False)), # this is now only available in a branch
|
||||
('BF_LAPACK', 'LAPACK base path', ''),
|
||||
('BF_LAPACK_LIB', 'LAPACK library', ''),
|
||||
('BF_LAPACK_LIB_STATIC', 'LAPACK library', ''),
|
||||
|
|
|
@ -32,9 +32,10 @@ if(WITH_BULLET)
|
|||
add_subdirectory(bullet2)
|
||||
endif()
|
||||
|
||||
if(WITH_MOD_CLOTH_ELTOPO)
|
||||
add_subdirectory(eltopo)
|
||||
endif()
|
||||
# now only available in a branch
|
||||
#if(WITH_MOD_CLOTH_ELTOPO)
|
||||
# add_subdirectory(eltopo)
|
||||
#endif()
|
||||
|
||||
if(WITH_BINRELOC)
|
||||
add_subdirectory(binreloc)
|
||||
|
|
|
@ -8,8 +8,11 @@ SConscript(['colamd/SConscript'])
|
|||
if env['WITH_BF_GAMEENGINE']:
|
||||
SConscript(['recastnavigation/SConscript'])
|
||||
|
||||
# now only available in a branch
|
||||
'''
|
||||
if env['WITH_BF_ELTOPO']:
|
||||
SConscript(['eltopo/SConscript'])
|
||||
'''
|
||||
|
||||
if env['WITH_BF_BULLET']:
|
||||
SConscript(['bullet2/src/SConscript'])
|
||||
|
|
|
@ -41,11 +41,12 @@ if env['WITH_BF_PYTHON']:
|
|||
if env['BF_DEBUG']:
|
||||
defs.append('DEBUG')
|
||||
|
||||
'''
|
||||
if env['WITH_BF_ELTOPO']:
|
||||
incs += ' #/extern/eltopo'
|
||||
incs += ' #/extern/eltopo/eltopo3d'
|
||||
defs.append('WITH_ELTOPO')
|
||||
|
||||
'''
|
||||
if env['WITH_BF_QUICKTIME']:
|
||||
incs += ' ../quicktime'
|
||||
|
||||
|
|
Loading…
Reference in New Issue