bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Adjusted scons files so disabling quicktime, python and sdl also removes their includes when building.

Browse Source 
writefile.c had usless include.
This commit is contained in:
Campbell Barton 2008-11-11 14:14:22 +00:00
parent 5161c2ee3a
commit 483136c8e4
13 changed files with 51 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SConstruct
View File

@ -517,11 +517,13 @@ else:
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['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:

2
intern/elbeem/SConscript
View File

@ -12,7 +12,7 @@ if env['WITH_BF_OPENMP']:
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 )

9
source/blender/blenkernel/SConscript
View File

@ -6,7 +6,7 @@ sources = env.Glob('intern/*.c')
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 += ' ../gpu #/extern/glew/include'
incs += ' ' + env['BF_OPENGL_INC']
incs += ' ' + env['BF_ZLIB_INC']
incs += ' ' + env['BF_SDL_INC']
defs = ''
@ -24,6 +23,12 @@ else:
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'

4
source/blender/blenlib/SConscript
View File

@ -7,9 +7,11 @@ cflags=''
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'

1
source/blender/blenloader/SConscript
View File

@ -5,7 +5,6 @@ sources = env.Glob('intern/*.c')
incs = '. #/intern/guardedalloc ../blenlib ../blenkernel'
incs += ' ../makesdna ../readblenfile ../include'
incs += ' ../python ../../kernel/gen_messaging'
incs += ' ../render/extern/include'
incs += ' ' + env['BF_ZLIB_INC']

2
source/blender/blenloader/intern/writefile.c
View File

@ -174,8 +174,6 @@ Important to know is that 'streaming' has been added to files, for Blender Publi
#include "BIF_verse.h"
#endif
#include "GEN_messaging.h"
#include "BLO_writefile.h"
#include "BLO_readfile.h"
#include "BLO_undofile.h"

4
source/blender/imbuf/SConscript
View File

@ -4,7 +4,7 @@ Import ('env')
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 @@ if env['WITH_BF_REDCODE']:
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] )

12
source/blender/nodes/SConscript
View File

@ -7,21 +7,21 @@ sources += env.Glob('intern/SHD_nodes/*.c')
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']:

4
source/blender/render/SConscript
View File

@ -6,7 +6,7 @@ sources = env.Glob('intern/source/*.c')
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 @@ else:
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')

17
source/blender/src/SConscript
View File

@ -23,22 +23,22 @@ incs = ' #/intern/guardedalloc #/intern/memutil'
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 @@ if env['WITH_BF_QUICKTIME']:
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_BUILDINFO']:
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'):

6
source/creator/SConscript
View File

@ -6,7 +6,7 @@ sources = 'creator.c'
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 env['WITH_BF_OPENEXR']:
if not env['WITH_BF_SDL']:
defs.append('DISABLE_SDL')
if not env['WITH_BF_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 )

6
source/gameengine/GameLogic/SConscript
View File

@ -8,11 +8,13 @@ incs += ' #/source/gameengine/Expressions #/intern/moto/include'
incs += ' #/source/gameengine/Rasterizer'
incs += ' ' + env['BF_PYTHON_INC']
incs += ' ' + env['BF_SDL_INC']
defs = ''
if not env['WITH_BF_SDL']:
if env['WITH_BF_SDL']:
incs += ' ' + env['BF_SDL_INC']
else:
defs += ' DISABLE_SDL'
env.BlenderLib ( 'bf_logic', sources, Split(incs), Split(defs), libtype=['game','player'], priority=[30, 110] )

4
source/gameengine/Ketsji/SConscript
View File

@ -41,8 +41,10 @@ if env['OURPLATFORM'] == 'win32-vc':
incs += ' ' + env['BF_SOLID_INC']
incs += ' ' + env['BF_PYTHON_INC']
incs += ' ' + env['BF_SDL_INC']
incs += ' ' + env['BF_BULLET_INC']
incs += ' ' + env['BF_OPENGL_INC']
if env['WITH_BF_SDL']:
incs += ' ' + env['BF_SDL_INC']
env.BlenderLib ( 'bf_ketsji', sources, Split(incs), [], libtype=['game','player'], priority=[25, 72], compileflags = cflags )