forked from bartvdbraak/blender
I swear, it was just an innocence change in guardedalloc!
The butterfly wing flap, causing a nice storm in the rest of blender. Now all dependencies should point ok again. CMakers, do double-test.
This commit is contained in:
parent
c14aca0e95
commit
322ff7dfe4
@ -28,6 +28,7 @@ set(INC
|
||||
.
|
||||
../makesdna
|
||||
../blenkernel
|
||||
../blenloader
|
||||
../gpu
|
||||
../../../intern/ghost
|
||||
../../../intern/guardedalloc
|
||||
|
@ -4,7 +4,7 @@ Import ('env')
|
||||
sources = env.Glob('intern/*.c')
|
||||
|
||||
cflags=''
|
||||
incs = '. ../makesdna ../blenkernel #/intern/guardedalloc #/intern/ghost ../editors/include ../gpu'
|
||||
incs = '. ../makesdna ../blenkernel #/intern/guardedalloc #/intern/ghost ../editors/include ../gpu ../blenloader'
|
||||
incs += ' ' + env['BF_FREETYPE_INC']
|
||||
incs += ' ' + env['BF_ZLIB_INC']
|
||||
defs = ''
|
||||
|
@ -30,6 +30,7 @@ set(INC
|
||||
../blenlib
|
||||
../imbuf
|
||||
../makesdna
|
||||
../blenloader
|
||||
../../../intern/guardedalloc
|
||||
)
|
||||
|
||||
|
@ -3,7 +3,7 @@ Import ('env')
|
||||
|
||||
sources = env.Glob('intern/*.c')
|
||||
|
||||
incs = '. .. #/intern/guardedalloc ../blenlib ../imbuf ../makesdna'
|
||||
incs = '. .. #/intern/guardedalloc ../blenlib ../imbuf ../makesdna ../blenloader'
|
||||
|
||||
defs = []
|
||||
|
||||
|
@ -30,6 +30,7 @@ set(INC
|
||||
.
|
||||
../blenlib
|
||||
../blenkernel
|
||||
../blenloader
|
||||
../windowmanager
|
||||
../makesdna
|
||||
../makesrna
|
||||
|
@ -30,11 +30,12 @@ Import ('env')
|
||||
sources = env.Glob('*.cpp')
|
||||
defs = []
|
||||
|
||||
# TODO sanitize inc path building
|
||||
# relative paths to include dirs, space-separated, string
|
||||
if env['OURPLATFORM']=='darwin':
|
||||
incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
|
||||
incs = '../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
|
||||
else:
|
||||
incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
|
||||
incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
|
||||
|
||||
if env['BF_BUILDINFO']:
|
||||
defs.append('NAN_BUILDINFO')
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -4,6 +4,6 @@ Import ('env')
|
||||
sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
|
||||
|
||||
env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), [], libtype=['core'], priority=[125] )
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -3,7 +3,7 @@ Import ('env')
|
||||
|
||||
sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf ../../blenloader'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../gpu ../../makesrna #/intern/opennl/extern'
|
||||
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -5,7 +5,7 @@ sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../gpu'
|
||||
incs += ' ../../gpu ../../blenloader'
|
||||
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
|
||||
|
||||
env.BlenderLib ( 'bf_editors_curve', sources, Split(incs), [], libtype=['core'], priority=[45] )
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../imbuf
|
||||
../../makesdna
|
||||
|
@ -5,7 +5,7 @@ sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../gpu'
|
||||
incs += ' ../../gpu ../../blenloader'
|
||||
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
|
||||
|
||||
env.BlenderLib ( 'bf_editors_gpencil', sources, Split(incs), [], libtype=['core'], priority=[45] )
|
||||
|
@ -23,6 +23,7 @@ set(INC
|
||||
../include
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../gpu
|
||||
../../imbuf
|
||||
|
@ -8,7 +8,7 @@ for source in env.Glob('*_api.c'):
|
||||
|
||||
incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc ../../gpu'
|
||||
incs += ' #/extern/glew/include'
|
||||
incs += ' #/extern/glew/include ../../blenloader'
|
||||
incs += ' ../../python/' # python button eval
|
||||
|
||||
defs = []
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../imbuf
|
||||
../../makesdna
|
||||
|
@ -5,7 +5,7 @@ sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../gpu'
|
||||
incs += ' ../../gpu ../../blenloader'
|
||||
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
|
||||
|
||||
if env['OURPLATFORM'] == 'linux2':
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -5,7 +5,7 @@ sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../gpu'
|
||||
incs += ' ../../gpu ../../blenloader'
|
||||
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
|
||||
|
||||
env.BlenderLib ( 'bf_editors_metaball', sources, Split(incs), [], libtype=['core'], priority=[45] )
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../gpu
|
||||
../../ikplugin
|
||||
|
@ -4,7 +4,7 @@ Import ('env')
|
||||
sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc ../../blenloader'
|
||||
incs += ' ../../makesrna ../../python ../../ikplugin'
|
||||
incs += ' ../../render/extern/include ../../gpu' # for object_bake.c
|
||||
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -5,7 +5,7 @@ sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../gpu'
|
||||
incs += ' ../../gpu ../../blenloader'
|
||||
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
|
||||
|
||||
defs = ''
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../imbuf
|
||||
../../gpu
|
||||
../../blenlib
|
||||
|
@ -8,7 +8,7 @@ defs = []
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../render/extern/include'
|
||||
incs += ' ../../gpu ../../makesrna'
|
||||
incs += ' ../../gpu ../../makesrna ../../blenloader'
|
||||
|
||||
if env['OURPLATFORM'] == 'linux2':
|
||||
cflags='-pthread'
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -5,7 +5,7 @@ sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc'
|
||||
incs += ' ../../makesrna'
|
||||
incs += ' ../../makesrna ../../blenloader'
|
||||
incs += ' #/intern/audaspace/intern'
|
||||
|
||||
defs = []
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -4,6 +4,6 @@ Import ('env')
|
||||
sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
|
||||
|
||||
env.BlenderLib ( 'bf_editors_space_action', sources, Split(incs), [], libtype=['core'], priority=[40] )
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -3,7 +3,7 @@ Import ('env')
|
||||
|
||||
sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna'
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../blenloader ../../makesdna'
|
||||
incs += ' ../../windowmanager ../../python ../../makesrna'
|
||||
incs += ' #/intern/guardedalloc #/extern/glew/include'
|
||||
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -5,7 +5,7 @@ sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../makesrna ../../render/extern/include'
|
||||
incs += ' ../../makesrna ../../render/extern/include ../../blenloader'
|
||||
|
||||
defs = []
|
||||
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -5,6 +5,6 @@ sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' #/intern/audaspace/intern'
|
||||
incs += ' #/intern/audaspace/intern ../../blenloader'
|
||||
|
||||
env.BlenderLib ( 'bf_editors_space_graph', sources, Split(incs), [], libtype=['core'], priority=[50] )
|
||||
|
@ -23,6 +23,7 @@ set(INC
|
||||
../include
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../imbuf
|
||||
../../makesdna
|
||||
|
@ -5,7 +5,7 @@ sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../render/extern/include ../../makesrna'
|
||||
incs += ' ../../render/extern/include ../../makesrna ../../blenloader'
|
||||
|
||||
defs = []
|
||||
|
||||
|
@ -23,6 +23,7 @@ set(INC
|
||||
../include
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../imbuf
|
||||
../../makesdna
|
||||
|
@ -4,7 +4,7 @@ Import ('env')
|
||||
sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf ../../blenfont'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
|
||||
|
||||
defs = []
|
||||
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -5,7 +5,7 @@ sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../makesrna ../interface'
|
||||
incs += ' ../../makesrna ../interface ../../blenloader'
|
||||
|
||||
defs = []
|
||||
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -4,6 +4,6 @@ Import ('env')
|
||||
sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
|
||||
|
||||
env.BlenderLib ( 'bf_editors_space_nla', sources, Split(incs), [], libtype=['core'], priority=[85] )
|
||||
|
@ -23,6 +23,7 @@ set(INC
|
||||
../include
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../imbuf
|
||||
../../makesdna
|
||||
|
@ -4,7 +4,7 @@ Import ('env')
|
||||
sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
|
||||
incs += ' ../../nodes ../../render/extern/include'
|
||||
incs += ' ../../nodes ../../render/extern/include ../../blenloader'
|
||||
incs += ' ../../windowmanager #intern/guardedalloc #extern/glew/include'
|
||||
defs = []
|
||||
cf = []
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../imbuf
|
||||
../../makesdna
|
||||
|
@ -4,7 +4,7 @@ Import ('env')
|
||||
sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc ../../makesrna'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc ../../makesrna ../../blenloader'
|
||||
incs += ' #/extern/glew/include'
|
||||
|
||||
env.BlenderLib ( 'bf_editors_space_outliner', sources, Split(incs), [], libtype=['core'], priority=[60] )
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -5,7 +5,7 @@ sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../makesrna'
|
||||
incs += ' ../../makesrna ../../blenloader'
|
||||
incs += ' ../../python'
|
||||
|
||||
defs = []
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../imbuf
|
||||
../../makesdna
|
||||
|
@ -5,7 +5,7 @@ sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../blenfont ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../makesrna'
|
||||
incs += ' ../../makesrna ../../blenloader'
|
||||
incs += ' #/intern/audaspace/intern'
|
||||
|
||||
env.BlenderLib ( 'bf_editors_space_sequencer', sources, Split(incs), [], libtype=['core'], priority=[100] )
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -4,6 +4,6 @@ Import ('env')
|
||||
sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
|
||||
|
||||
env.BlenderLib ( 'bf_editors_space_sound', sources, Split(incs), [], libtype=['core'], priority=[75] )
|
||||
|
@ -23,6 +23,7 @@ set(INC
|
||||
../include
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -5,7 +5,7 @@ sources = env.Glob('*.c')
|
||||
defs = []
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../python ../../makesrna ../../blenfont'
|
||||
incs += ' ../../python ../../makesrna ../../blenfont ../../blenloader'
|
||||
|
||||
if env['WITH_BF_PYTHON']:
|
||||
defs.append('WITH_PYTHON')
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -5,6 +5,6 @@ sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../makesrna'
|
||||
incs += ' ../../makesrna ../../blenloader'
|
||||
|
||||
env.BlenderLib ( 'bf_editors_space_time', sources, Split(incs), [], libtype=['core'], priority=[65] )
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -4,7 +4,7 @@ Import ('env')
|
||||
sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf ../../blenfont'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
|
||||
|
||||
defs = []
|
||||
|
||||
|
@ -23,6 +23,7 @@ set(INC
|
||||
../include
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../gpu
|
||||
../../imbuf
|
||||
|
@ -6,7 +6,7 @@ defs = [ 'GLEW_STATIC' ]
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../render/extern/include'
|
||||
incs += ' ../../render/extern/include ../../blenloader'
|
||||
incs += ' ../../gpu ../../makesrna ../../blenfont'
|
||||
incs += ' #/intern/smoke/extern'
|
||||
incs += ' #source/kernel/gen_system'
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -6,6 +6,6 @@ sources = env.Glob('*.c')
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../render/extern/include'
|
||||
incs += ' ../../gpu ../../makesrna'
|
||||
incs += ' ../../gpu ../../makesrna ../../blenloader'
|
||||
|
||||
env.BlenderLib ( 'bf_editors_transform', sources, Split(incs), [], libtype=['core'], priority=[40] )
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -6,5 +6,6 @@ sources = env.Glob('*.c')
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../makesrna'
|
||||
incs += ' ../../blenloader'
|
||||
|
||||
env.BlenderLib ( 'bf_editors_util', sources, Split(incs), [], libtype=['core'], priority=[130] )
|
||||
|
@ -22,6 +22,7 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -5,6 +5,6 @@ sources = env.Glob('*.c')
|
||||
|
||||
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
|
||||
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
incs += ' ../../makesrna #/intern/opennl/extern ../../gpu'
|
||||
incs += ' ../../makesrna #/intern/opennl/extern ../../gpu ../../blenloader'
|
||||
|
||||
env.BlenderLib ( 'bf_editors_uvedit', sources, Split(incs), [], libtype=['core'], priority=[45] )
|
||||
|
@ -28,6 +28,7 @@ set(INC
|
||||
.
|
||||
../blenlib
|
||||
../blenkernel
|
||||
../blenloader
|
||||
../imbuf
|
||||
../makesdna
|
||||
../makesrna
|
||||
|
@ -5,7 +5,7 @@ sources = env.Glob('intern/*.c')
|
||||
|
||||
defs = [ 'GLEW_STATIC' ]
|
||||
|
||||
incs = '../blenlib ../blenkernel ../makesdna ../include'
|
||||
incs = '../blenlib ../blenkernel ../makesdna ../include ../blenloader'
|
||||
incs += ' #/extern/glew/include #intern/guardedalloc #intern/smoke/extern ../imbuf .'
|
||||
|
||||
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
|
||||
|
@ -29,6 +29,7 @@ set(INC
|
||||
../avi
|
||||
../blenlib
|
||||
../blenkernel
|
||||
../blenloader
|
||||
../makesdna
|
||||
../../../intern/memutil
|
||||
../../../intern/guardedalloc
|
||||
|
@ -4,7 +4,7 @@ Import ('env')
|
||||
sources = env.Glob('intern/*.c')
|
||||
|
||||
incs = '. ../makesdna #/intern/guardedalloc #/intern/memutil ../blenlib'
|
||||
incs += ' ../avi ../blenkernel'
|
||||
incs += ' ../avi ../blenkernel ../blenloader'
|
||||
|
||||
|
||||
incs += ' ' + env['BF_JPEG_INC']
|
||||
|
@ -29,6 +29,7 @@ set(INC
|
||||
..
|
||||
../..
|
||||
../../../blenkernel
|
||||
../../../blenloader
|
||||
../../../blenlib
|
||||
../../../makesdna
|
||||
../../../../../intern/guardedalloc
|
||||
|
@ -5,6 +5,7 @@ source_files = env.Glob('*.c')
|
||||
|
||||
incs = ['.',
|
||||
'../../../blenkernel',
|
||||
'../../../blenloader',
|
||||
'../../',
|
||||
'..',
|
||||
'../../../blenlib',
|
||||
|
@ -29,6 +29,7 @@
|
||||
|
||||
blender_include_dirs(
|
||||
../../../../intern/guardedalloc
|
||||
../../blenloader
|
||||
..
|
||||
)
|
||||
|
||||
|
@ -18,7 +18,7 @@ dna = env.Clone()
|
||||
makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ')
|
||||
|
||||
makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc',
|
||||
'../../makesdna'])
|
||||
'../../makesdna', '../../blenloader'])
|
||||
|
||||
if env['OURPLATFORM'] == 'linuxcross':
|
||||
USE_WINE = True # when cross compiling on linux 64bit this is useful
|
||||
|
@ -7,7 +7,7 @@ o = SConscript('intern/SConscript')
|
||||
objs += o
|
||||
|
||||
incs = '#/intern/guardedalloc #/intern/memutil #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .'
|
||||
incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin ../blenfont'
|
||||
incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin ../blenfont ../blenloader'
|
||||
incs += ' ../render/extern/include'
|
||||
|
||||
defs = []
|
||||
|
@ -130,6 +130,7 @@ blender_include_dirs(
|
||||
.
|
||||
..
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../blenfont
|
||||
../../gpu
|
||||
|
@ -29,7 +29,7 @@ makesrna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesrna/\\"" '
|
||||
|
||||
defs = []
|
||||
|
||||
incs = '#/intern/guardedalloc ../../blenlib ../../blenkernel'
|
||||
incs = '#/intern/guardedalloc ../../blenlib ../../blenkernel ../../blenloader'
|
||||
incs += ' ../../imbuf ../../makesdna ../../makesrna ../../ikplugin'
|
||||
incs += ' ../../windowmanager ../../editors/include ../../blenfont'
|
||||
incs += ' ../../render/extern/include'
|
||||
|
@ -27,6 +27,7 @@
|
||||
set(INC
|
||||
. ./intern
|
||||
../blenlib
|
||||
../blenloader
|
||||
../makesdna
|
||||
../blenkernel
|
||||
../blenkernel/intern
|
||||
|
@ -5,7 +5,7 @@ sources = env.Glob('intern/*.c')
|
||||
|
||||
incs = '. ./intern'
|
||||
incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern #/intern/elbeem/extern'
|
||||
incs += ' ../render/extern/include'
|
||||
incs += ' ../render/extern/include ../blenloader'
|
||||
incs += ' ../include ../blenlib ../makesdna ../blenkernel ../blenkernel/intern'
|
||||
|
||||
incs += ' ' + env['BF_ZLIB_INC']
|
||||
|
@ -23,6 +23,7 @@ set(INC
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../../../intern/guardedalloc
|
||||
../../../../extern/glew/include
|
||||
${PYTHON_INCLUDE_DIRS}
|
||||
|
@ -32,6 +32,7 @@ set(INC
|
||||
..
|
||||
../../../intern/guardedalloc
|
||||
../../../source/blender/makesdna
|
||||
../../../source/blender/blenloader
|
||||
../../../source/blender/makesrna
|
||||
../../../source/blender/blenkernel
|
||||
)
|
||||
|
@ -6,6 +6,7 @@ sources = 'stubs.c'
|
||||
incs = '#/intern/guardedalloc'
|
||||
incs += ' #/source/blender/makesdna'
|
||||
incs += ' #/source/blender/makesrna'
|
||||
incs += ' #/source/blender/blenloader'
|
||||
|
||||
defs = ''
|
||||
if env['WITH_BF_INTERNATIONAL']:
|
||||
|
Loading…
Reference in New Issue
Block a user