diff options
| author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-05-05 20:56:44 +0400 |
|---|---|---|
| committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-05-05 20:56:44 +0400 |
| commit | ec906913842a9b56805b010153295419f198ed6a (patch) | |
| tree | 1499a319c77b12f19ca8c717f7185f8211b7adb9 /config | |
| parent | 1cf33787932aabc9e2d812f4cf50655059dcbff2 (diff) | |
| parent | 945a083e70b79d361f5a9b1be76c9722565c9fe8 (diff) | |
merge to 14689, Freestyle library changes, SConscript start
Diffstat (limited to 'config')
| -rw-r--r-- | config/darwin-config.py | 20 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 1 |
2 files changed, 18 insertions, 3 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py index b12a93a1da8..071a245202b 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -160,6 +160,21 @@ BF_SOLID_LIB = 'extern_solid' WITH_BF_YAFRAY = 'true' +WITH_BF_FREESTYLE = 'true' +BF_FREESTYLE = '#extern/freestyle' +BF_FREESTYLE_SRC = '${BF_FREESTYLE}/src' +BF_SWIG = '${BF_FREESTYLE}/swig' +BF_LIB3DS = '${BF_FREESTYLE}/lib3ds' +BF_LIB3DS_LIB = 'extern_lib3ds' +BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs' +BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds' + +# WITH_BF_OPENEXR = 'true' +# BF_OPENEXR = '${LCGDIR}/openexr' +# BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR' +# BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread' +# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' + #WITH_BF_NSPR = 'true' #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr @@ -220,9 +235,10 @@ if USE_SDK=='true': CCFLAGS=SDK_FLAGS+CCFLAGS CXXFLAGS=SDK_FLAGS+CXXFLAGS +# you can add -mssse3 if gcc >= 4.2 if MAC_PROC == 'i386': - REL_CFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3','-mssse3'] - REL_CCFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3','-mssse3'] + REL_CFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3'] + REL_CCFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3'] else: CFLAGS = CFLAGS+['-fno-strict-aliasing'] CCFLAGS = CCFLAGS+['-fno-strict-aliasing'] diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 1f7e62102af..32b6597b5d5 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -170,7 +170,6 @@ PLATFORM_LINKFLAGS = ''' /NODEFAULTLIB:"libcd.lib" /NODEFAULTLIB:"libcpd.lib" /NODEFAULTLIB:"libcp.lib" - /NODEFAULTLIB:"libcmtd.lib" ''' BF_BUILDDIR = '..\\build\\win32-vc' |