[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17406] trunk/blender: Adjusted scons files so disabling quicktime, python and sdl also removes their includes when building.
Campbell Barton
ideasman42 at gmail.com
Tue Nov 11 15:14:23 CET 2008
Revision: 17406
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17406
Author: campbellbarton
Date: 2008-11-11 15:14:22 +0100 (Tue, 11 Nov 2008)
Log Message:
-----------
Adjusted scons files so disabling quicktime, python and sdl also removes their includes when building.
writefile.c had usless include.
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/intern/elbeem/SConscript
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/blenlib/SConscript
trunk/blender/source/blender/blenloader/SConscript
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/imbuf/SConscript
trunk/blender/source/blender/nodes/SConscript
trunk/blender/source/blender/render/SConscript
trunk/blender/source/blender/src/SConscript
trunk/blender/source/creator/SConscript
trunk/blender/source/gameengine/GameLogic/SConscript
trunk/blender/source/gameengine/Ketsji/SConscript
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2008-11-11 12:56:57 UTC (rev 17405)
+++ trunk/blender/SConstruct 2008-11-11 14:14:22 UTC (rev 17406)
@@ -517,15 +517,17 @@
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll',
'${LCGDIR}/png/lib/libpng.dll',
- '#release/windows/extra/python25.zip',
'#release/windows/extra/zlib.pyd',
- '${LCGDIR}/sdl/lib/SDL.dll',
'${LCGDIR}/zlib/lib/zlib.dll',
'${LCGDIR}/tiff/lib/libtiff.dll']
- if env['BF_DEBUG']:
- dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}_d.dll')
- else:
- dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll')
+ if env['WITH_BF_SDL']:
+ dllsources.append('${LCGDIR}/sdl/lib/SDL.dll')
+ if env['WITH_BF_PYTHON']:
+ dllsources.append('#release/windows/extra/python25.zip')
+ if env['BF_DEBUG']:
+ dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}_d.dll')
+ else:
+ dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll')
if env['OURPLATFORM'] == 'win32-mingw':
dllsources += ['${LCGDIR}/pthreads/lib/pthreadGC2.dll']
else:
Modified: trunk/blender/intern/elbeem/SConscript
===================================================================
--- trunk/blender/intern/elbeem/SConscript 2008-11-11 12:56:57 UTC (rev 17405)
+++ trunk/blender/intern/elbeem/SConscript 2008-11-11 14:14:22 UTC (rev 17406)
@@ -12,7 +12,7 @@
if env['OURPLATFORM']=='win32-vc':
defs += ' USE_MSVC6FIXES'
-incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] + ' ' +env['BF_SDL_INC']
+incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC']
incs += ' extern '
env.BlenderLib ('bf_elbeem', sources, Split(incs), Split(defs), libtype='blender', priority=0 )
Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript 2008-11-11 12:56:57 UTC (rev 17405)
+++ trunk/blender/source/blender/blenkernel/SConscript 2008-11-11 14:14:22 UTC (rev 17406)
@@ -6,7 +6,7 @@
incs = '. #/intern/guardedalloc ../include ../blenlib ../makesdna'
incs += ' ../render/extern/include #/intern/decimation/extern'
incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes'
-incs += ' #/intern/iksolver/extern ../blenloader ../quicktime'
+incs += ' #/intern/iksolver/extern ../blenloader'
incs += ' #/extern/bullet2/src'
incs += ' #/intern/bmfont'
incs += ' #/intern/opennl/extern'
@@ -14,7 +14,6 @@
incs += ' ' + env['BF_OPENGL_INC']
incs += ' ' + env['BF_ZLIB_INC']
-incs += ' ' + env['BF_SDL_INC']
defs = ''
@@ -24,6 +23,12 @@
incs += ' ../python'
incs += ' ' + env['BF_PYTHON_INC']
+if env['WITH_BF_QUICKTIME']:
+ incs += ' ../quicktime'
+
+if env['WITH_BF_SDL']:
+ incs += ' ' + env['BF_SDL_INC']
+
if env['WITH_BF_INTERNATIONAL']:
defs += ' WITH_FREETYPE2'
Modified: trunk/blender/source/blender/blenlib/SConscript
===================================================================
--- trunk/blender/source/blender/blenlib/SConscript 2008-11-11 12:56:57 UTC (rev 17405)
+++ trunk/blender/source/blender/blenlib/SConscript 2008-11-11 14:14:22 UTC (rev 17406)
@@ -7,9 +7,11 @@
incs = '. ../makesdna ../blenkernel #/intern/guardedalloc ../include'
incs += ' ' + env['BF_FREETYPE_INC']
incs += ' ' + env['BF_ZLIB_INC']
-incs += ' ' + env['BF_SDL_INC']
defs = ''
+if env['WITH_BF_SDL']:
+ incs += ' ' + env['BF_SDL_INC']
+
if env['WITH_BF_INTERNATIONAL']:
defs = 'WITH_FREETYPE2'
Modified: trunk/blender/source/blender/blenloader/SConscript
===================================================================
--- trunk/blender/source/blender/blenloader/SConscript 2008-11-11 12:56:57 UTC (rev 17405)
+++ trunk/blender/source/blender/blenloader/SConscript 2008-11-11 14:14:22 UTC (rev 17406)
@@ -5,7 +5,6 @@
incs = '. #/intern/guardedalloc ../blenlib ../blenkernel'
incs += ' ../makesdna ../readblenfile ../include'
-incs += ' ../python ../../kernel/gen_messaging'
incs += ' ../render/extern/include'
incs += ' ' + env['BF_ZLIB_INC']
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2008-11-11 12:56:57 UTC (rev 17405)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2008-11-11 14:14:22 UTC (rev 17406)
@@ -174,8 +174,6 @@
#include "BIF_verse.h"
#endif
-#include "GEN_messaging.h"
-
#include "BLO_writefile.h"
#include "BLO_readfile.h"
#include "BLO_undofile.h"
Modified: trunk/blender/source/blender/imbuf/SConscript
===================================================================
--- trunk/blender/source/blender/imbuf/SConscript 2008-11-11 12:56:57 UTC (rev 17405)
+++ trunk/blender/source/blender/imbuf/SConscript 2008-11-11 14:14:22 UTC (rev 17406)
@@ -4,7 +4,7 @@
sources = env.Glob('intern/*.c')
incs = '. ../makesdna #/intern/guardedalloc #/intern/memutil ../blenlib'
-incs += ' ../avi ../quicktime ../blenkernel'
+incs += ' ../avi ../blenkernel'
incs += ' ' + env['BF_JPEG_INC']
incs += ' ' + env['BF_PNG_INC']
@@ -36,7 +36,7 @@
incs += ' ' + env['BF_REDCODE_INC']
if env['WITH_BF_QUICKTIME']:
- incs += ' ' + env['BF_QUICKTIME_INC']
+ incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
defs.append('WITH_QUICKTIME')
env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80, 40] )
Modified: trunk/blender/source/blender/nodes/SConscript
===================================================================
--- trunk/blender/source/blender/nodes/SConscript 2008-11-11 12:56:57 UTC (rev 17405)
+++ trunk/blender/source/blender/nodes/SConscript 2008-11-11 14:14:22 UTC (rev 17406)
@@ -7,21 +7,21 @@
incs = '. ./intern '
incs += '#/intern/guardedalloc ../include ../blenlib ../makesdna'
-incs += ' ../python ../render/extern/include '
+incs += ' ../render/extern/include '
incs += ' ../imbuf ../avi '
-incs += ' ../blenloader ../quicktime'
+incs += ' ../blenloader'
incs += ' ../blenkernel ../renderconverter '
incs += ' ../gpu #/extern/glew/include '
-
-incs += ' ' + env['BF_PYTHON_INC']
incs += ' ' + env['BF_OPENGL_INC']
incs += ' ' + env['BF_ZLIB_INC']
-incs += ' ' + env['BF_SDL_INC']
defs = ''
-if not env['WITH_BF_PYTHON']:
+if env['WITH_BF_PYTHON']:
+ incs += ' ' + env['BF_PYTHON_INC']
+ incs += ' ../python'
+else:
defs += 'DISABLE_PYTHON'
if env['WITH_BF_INTERNATIONAL']:
Modified: trunk/blender/source/blender/render/SConscript
===================================================================
--- trunk/blender/source/blender/render/SConscript 2008-11-11 12:56:57 UTC (rev 17405)
+++ trunk/blender/source/blender/render/SConscript 2008-11-11 14:14:22 UTC (rev 17406)
@@ -6,7 +6,7 @@
incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna'
incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
-incs += ' ../quicktime ../include ../../kernel/gen_messaging ../blenloader'
+incs += ' ../include ../blenloader'
defs = []
@@ -17,7 +17,7 @@
if env['WITH_BF_QUICKTIME']:
defs.append('WITH_QUICKTIME')
- incs += ' ' + env['BF_QUICKTIME_INC']
+ incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG')
Modified: trunk/blender/source/blender/src/SConscript
===================================================================
--- trunk/blender/source/blender/src/SConscript 2008-11-11 12:56:57 UTC (rev 17405)
+++ trunk/blender/source/blender/src/SConscript 2008-11-11 14:14:22 UTC (rev 17406)
@@ -23,22 +23,22 @@
incs += ' ../blenlib ../makesdna ../blenkernel'
incs += ' ../include #/intern/bmfont ../imbuf ../render/extern/include'
incs += ' #/intern/bsp/extern ../radiosity/extern/include'
-incs += ' #/intern/decimation/extern ../blenloader ../python'
+incs += ' #/intern/decimation/extern ../blenloader'
incs += ' ../../kernel/gen_system #/intern/SoundSystem ../readstreamglue ../nodes'
-incs += ' ../quicktime #/intern/elbeem/extern'
+incs += ' #/intern/elbeem/extern'
incs += ' #/intern/ghost #/intern/opennl/extern'
incs += ' ../gpu #extern/glew/include'
-
-incs += ' ' + env['BF_PYTHON_INC']
-incs += ' ' + env['BF_SDL_INC']
incs += ' ' + env['BF_OPENGL_INC']
defs = []
-if not env['WITH_BF_PYTHON']:
+if env['WITH_BF_PYTHON']:
+ incs += ' ../python ' + env['BF_PYTHON_INC']
+else:
defs.append('DISABLE_PYTHON')
+
if env['BF_TWEAK_MODE']:
defs.append('TWEAK_MODE')
@@ -61,6 +61,7 @@
defs.append('WITH_QUICKTIME')
if env['WITH_BF_ICONV']:
+ incs += ' ../quicktime'
incs += ' ' + env['BF_ICONV_INC']
defs.append('WITH_ICONV')
@@ -85,7 +86,9 @@
if env['BF_NO_ELBEEM']:
defs.append('DISABLE_ELBEEM')
-if not env['WITH_BF_SDL']:
+if env['WITH_BF_SDL']:
+ incs += ' ' + env['BF_SDL_INC']
+else:
defs.append('DISABLE_SDL')
if env['BF_SPLIT_SRC'] and (env['OURPLATFORM'] == 'win32-mingw'):
Modified: trunk/blender/source/creator/SConscript
===================================================================
--- trunk/blender/source/creator/SConscript 2008-11-11 12:56:57 UTC (rev 17405)
+++ trunk/blender/source/creator/SConscript 2008-11-11 14:14:22 UTC (rev 17406)
@@ -6,7 +6,7 @@
incs = '#/intern/guardedalloc ../blender/blenlib ../blender/blenkernel'
incs += ' ../blender/include ../blender/blenloader ../blender/imbuf'
incs += ' ../blender/renderconverter ../blender/render/extern/include'
-incs += ' ../blender/python ../blender/makesdna ../kernel/gen_messaging'
+incs += ' ../blender/makesdna ../kernel/gen_messaging'
incs += ' ../kernel/gen_system #/extern/glew/include ../blender/gpu'
incs += ' ' + env['BF_OPENGL_INC']
@@ -25,7 +25,9 @@
if not env['WITH_BF_SDL']:
defs.append('DISABLE_SDL')
-if not env['WITH_BF_PYTHON']:
- defs.append('DISABLE_PYTHON')
+if env['WITH_BF_PYTHON']:
+ incs += ' ../blender/python'
+else:
+ defs.append('DISABLE_PYTHON')
env.BlenderLib ( libname = 'blender_creator', sources = Split(sources), includes = Split(incs), defines = defs, libtype='core', priority = 1 )
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list