From 314d460eb87ec6f383358e0dbb77e9fdf5c99f23 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 25 Sep 2009 02:40:10 +0000 Subject: options WITH_LZO and WITH_LZMA for cmake and scons (default to true) pointcache.c also needed to have checks for these defines. --- extern/CMakeLists.txt | 9 +++++++-- extern/Makefile | 6 +++--- extern/SConscript | 7 +++++-- 3 files changed, 15 insertions(+), 7 deletions(-) (limited to 'extern') diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 44e47aaf88d..35271d24a2d 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -38,5 +38,10 @@ IF(WITH_OPENJPEG) ADD_SUBDIRECTORY(libopenjpeg) ENDIF(WITH_OPENJPEG) -ADD_SUBDIRECTORY(lzo) -ADD_SUBDIRECTORY(lzma) +IF(WITH_LZO) + ADD_SUBDIRECTORY(lzo) +ENDIF(WITH_LZO) + +IF(WITH_LZMA) + ADD_SUBDIRECTORY(lzma) +ENDIF(WITH_LZMA) diff --git a/extern/Makefile b/extern/Makefile index b81fbd2b91a..a30cd1d7ca3 100644 --- a/extern/Makefile +++ b/extern/Makefile @@ -33,9 +33,9 @@ DIR = $(OCGDIR)/extern DIRS = glew/src # Cloth requires it -#ifneq ($(NAN_NO_KETSJI), true) -DIRS += bullet2 -#endif +ifeq ($(NAN_USE_BULLET), true) + DIRS += bullet2 +endif ifeq ($(WITH_BINRELOC), true) DIRS += binreloc diff --git a/extern/SConscript b/extern/SConscript index 20604d87e45..af057a73927 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -22,5 +22,8 @@ if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '': if env['OURPLATFORM'] == 'linux2': SConscript(['binreloc/SConscript']); -SConscript(['lzo/SConscript']) -SConscript(['lzma/SConscript']) +if env['WITH_BF_LZO']: + SConscript(['lzo/SConscript']) + +if env['WITH_BF_LZMA']: + SConscript(['lzma/SConscript']) -- cgit v1.2.3