forked from bartvdbraak/blender
remove unused defines, cant check every case but from grepping the souece it should go ok.
This commit is contained in:
parent
af522abf33
commit
0f07bea06b
6
extern/bullet2/CMakeLists.txt
vendored
6
extern/bullet2/CMakeLists.txt
vendored
@ -32,14 +32,12 @@ FILE(GLOB SRC
|
||||
src/BulletCollision/CollisionShapes/*.cpp
|
||||
src/BulletCollision/NarrowPhaseCollision/*.cpp
|
||||
src/BulletCollision/Gimpact/*.cpp
|
||||
src/BulletCollision//CollisionDispatch/*.cpp
|
||||
src/BulletCollision/CollisionDispatch/*.cpp
|
||||
src/BulletDynamics/ConstraintSolver/*.cpp
|
||||
src/BulletDynamics/Vehicle/*.cpp
|
||||
src/BulletDynamics/Dynamics/*.cpp
|
||||
src/BulletSoftBody/*.cpp
|
||||
)
|
||||
|
||||
ADD_DEFINITIONS(-D_LIB)
|
||||
|
||||
BLENDERLIB(extern_bullet "${SRC}" "${INC}")
|
||||
#, libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
|
||||
|
||||
|
4
extern/bullet2/src/SConscript
vendored
4
extern/bullet2/src/SConscript
vendored
@ -4,11 +4,11 @@ import os
|
||||
|
||||
Import('env')
|
||||
|
||||
defs = 'USE_DOUBLES QHULL _LIB'
|
||||
defs = ''
|
||||
cflags = []
|
||||
|
||||
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
|
||||
defs += ' WIN32 NDEBUG _WINDOWS _LIB'
|
||||
defs += ' WIN32 NDEBUG _WINDOWS'
|
||||
#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
|
||||
cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs']
|
||||
elif env['OURPLATFORM']=='win32-mingw':
|
||||
|
@ -38,20 +38,6 @@ IF(WIN32)
|
||||
SET(INC ${INC} ${PTHREADS_INC})
|
||||
ENDIF(WIN32)
|
||||
|
||||
IF(WITH_OPENEXR)
|
||||
ADD_DEFINITIONS(-DWITH_OPENEXR)
|
||||
ENDIF(WITH_OPENEXR)
|
||||
|
||||
IF(WITH_QUICKTIME)
|
||||
SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
|
||||
ADD_DEFINITIONS(-DWITH_QUICKTIME)
|
||||
ENDIF(WITH_QUICKTIME)
|
||||
|
||||
IF(WITH_FFMPEG)
|
||||
SET(INC ${INC} ${FFMPEG_INC})
|
||||
ADD_DEFINITIONS(-DWITH_FFMPEG)
|
||||
ENDIF(WITH_FFMPEG)
|
||||
|
||||
IF(WITH_PYTHON)
|
||||
SET(INC ${INC} ../python ${PYTHON_INC})
|
||||
ELSE(WITH_PYTHON)
|
||||
|
@ -27,17 +27,6 @@ if env['WITH_BF_PYTHON']:
|
||||
else:
|
||||
defs.append('DISABLE_PYTHON')
|
||||
|
||||
if env['WITH_BF_OPENEXR']:
|
||||
defs.append('WITH_OPENEXR')
|
||||
|
||||
if env['WITH_BF_FFMPEG']:
|
||||
defs.append('WITH_FFMPEG')
|
||||
incs += ' ' + env['BF_FFMPEG_INC']
|
||||
|
||||
if env['WITH_BF_QUICKTIME']:
|
||||
defs.append('WITH_QUICKTIME')
|
||||
incs += ' ' + env['BF_QUICKTIME_INC']
|
||||
|
||||
if env['OURPLATFORM'] == 'linux2':
|
||||
cflags='-pthread'
|
||||
incs += ' ../../../extern/binreloc/include'
|
||||
|
@ -46,8 +46,6 @@ IF(WITH_FFMPEG)
|
||||
ADD_DEFINITIONS(-DWITH_FFMPEG)
|
||||
ENDIF(WITH_FFMPEG)
|
||||
|
||||
ADD_DEFINITIONS(-DWITH_CCGSUBSURF)
|
||||
|
||||
BLENDERLIB(bf_python "${SRC}" "${INC}")
|
||||
BLENDERLIB(bf_gen_python "${GENSRC}" "${INC}")
|
||||
|
||||
|
@ -47,10 +47,6 @@ IF(WITH_QUICKTIME)
|
||||
ADD_DEFINITIONS(-DWITH_QUICKTIME)
|
||||
ENDIF(WITH_QUICKTIME)
|
||||
|
||||
IF(WITH_FFMPEG)
|
||||
ADD_DEFINITIONS(-DWITH_FFMPEG)
|
||||
ENDIF(WITH_FFMPEG)
|
||||
|
||||
#TODO
|
||||
#if env['OURPLATFORM']=='linux2':
|
||||
# cflags='-pthread'
|
||||
|
@ -14,9 +14,6 @@ if env['WITH_BF_QUICKTIME']:
|
||||
defs.append('WITH_QUICKTIME')
|
||||
incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
|
||||
|
||||
if env['WITH_BF_FFMPEG']:
|
||||
defs.append('WITH_FFMPEG')
|
||||
|
||||
if env['WITH_BF_OPENEXR']:
|
||||
defs.append('WITH_OPENEXR')
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user