Skip to content
Snippets Groups Projects
Commit 959f1a0f authored by Maxime Curioni's avatar Maxime Curioni
Browse files

soc-2008-mxcurioni: swig compiles as independent library

parent 914a4d1a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 86 additions and 12 deletions
SConstruct
+ 4
− 1
View file @ 959f1a0f
...@@ -269,7 +269,7 @@ if not quickie and do_clean: ...@@ -269,7 +269,7 @@ if not quickie and do_clean:
print "clean dir %s"%(B.root_build_dir+dir) print "clean dir %s"%(B.root_build_dir+dir)
shutil.rmtree(B.root_build_dir+dir) shutil.rmtree(B.root_build_dir+dir)
for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak', for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak',
'extern/xvidcore/build/generic/platform.inc','extern/freestyle/lib3ds/Makefile']: 'extern/xvidcore/build/generic/platform.inc','extern/freestyle/lib3ds/Makefile','extern/freestyle/swig/Makefile']:
if os.path.exists(confile): if os.path.exists(confile):
print "clean file %s"%confile print "clean file %s"%confile
os.remove(confile) os.remove(confile)
...@@ -340,12 +340,15 @@ if env['WITH_BF_PLAYER']: ...@@ -340,12 +340,15 @@ if env['WITH_BF_PLAYER']:
playerlist = B.create_blender_liblist(env, 'player') playerlist = B.create_blender_liblist(env, 'player')
env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer') env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
##### Now define some targets ##### Now define some targets
#------------ INSTALL #------------ INSTALL
#-- binaries #-- binaries
blenderinstall = [] blenderinstall = []
if env['OURPLATFORM']=='darwin': if env['OURPLATFORM']=='darwin':
for prg in B.program_list: for prg in B.program_list:
......
config/darwin-config.py
+ 1
− 0
View file @ 959f1a0f
...@@ -164,6 +164,7 @@ WITH_BF_FREESTYLE = 'true' ...@@ -164,6 +164,7 @@ WITH_BF_FREESTYLE = 'true'
BF_FREESTYLE = '#extern/freestyle' BF_FREESTYLE = '#extern/freestyle'
BF_FREESTYLE_SRC = '#source/blender/freestyle/src' BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
BF_SWIG = '${BF_FREESTYLE}/swig' BF_SWIG = '${BF_FREESTYLE}/swig'
BF_SWIG_LIB = 'extern_swig'
BF_LIB3DS = '${BF_FREESTYLE}/lib3ds' BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
BF_LIB3DS_LIB = 'extern_lib3ds' BF_LIB3DS_LIB = 'extern_lib3ds'
BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs' BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
......
config/linux2-config.py
+ 10
− 0
View file @ 959f1a0f
...@@ -86,6 +86,16 @@ BF_SOLID_LIB = 'extern_solid' ...@@ -86,6 +86,16 @@ BF_SOLID_LIB = 'extern_solid'
WITH_BF_YAFRAY = 'true' WITH_BF_YAFRAY = 'true'
WITH_BF_FREESTYLE = 'true'
BF_FREESTYLE = '#extern/freestyle'
BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
BF_SWIG = '${BF_FREESTYLE}/swig'
BF_SWIG_LIB = 'extern_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_NSPR = 'true' #WITH_BF_NSPR = 'true'
#BF_NSPR = $(LIBDIR)/nspr #BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
......
config/linuxcross-config.py
+ 12
− 0
View file @ 959f1a0f
...@@ -6,6 +6,18 @@ BF_VERSE_INCLUDE = "#extern/verse/dist" ...@@ -6,6 +6,18 @@ BF_VERSE_INCLUDE = "#extern/verse/dist"
WITH_BF_YAFRAY = 'true' WITH_BF_YAFRAY = 'true'
WITH_BF_FREESTYLE = 'true'
BF_FREESTYLE = '#extern/freestyle'
BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
BF_SWIG = '${BF_FREESTYLE}/swig'
BF_SWIG_LIB = 'extern_swig'
BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
BF_LIB3DS_LIB = 'extern_lib3ds'
BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
###########################
BF_PYTHON = LIBDIR + '/python' BF_PYTHON = LIBDIR + '/python'
BF_PYTHON_VERSION = '2.5' BF_PYTHON_VERSION = '2.5'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
......
config/openbsd3-config.py
+ 10
− 0
View file @ 959f1a0f
...@@ -80,6 +80,16 @@ BF_SOLID_LIB = 'extern_solid' ...@@ -80,6 +80,16 @@ BF_SOLID_LIB = 'extern_solid'
WITH_BF_YAFRAY = 'true' WITH_BF_YAFRAY = 'true'
WITH_BF_FREESTYLE = 'true'
BF_FREESTYLE = '#extern/freestyle'
BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
BF_SWIG = '${BF_FREESTYLE}/swig'
BF_SWIG_LIB = 'extern_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_NSPR = 'true' #WITH_BF_NSPR = 'true'
#BF_NSPR = $(LIBDIR)/nspr #BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
......
config/sunos5-config.py
+ 10
− 0
View file @ 959f1a0f
...@@ -82,6 +82,16 @@ BF_SOLID_LIB = 'extern_solid' ...@@ -82,6 +82,16 @@ BF_SOLID_LIB = 'extern_solid'
WITH_BF_YAFRAY = 'true' WITH_BF_YAFRAY = 'true'
WITH_BF_FREESTYLE = 'true'
BF_FREESTYLE = '#extern/freestyle'
BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
BF_SWIG = '${BF_FREESTYLE}/swig'
BF_SWIG_LIB = 'extern_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_NSPR = 'true' #WITH_BF_NSPR = 'true'
#BF_NSPR = $(LIBDIR)/nspr #BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
......
config/win32-mingw-config.py
+ 10
− 0
View file @ 959f1a0f
...@@ -97,6 +97,16 @@ BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE' ...@@ -97,6 +97,16 @@ BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
WITH_BF_YAFRAY = 'true' WITH_BF_YAFRAY = 'true'
WITH_BF_FREESTYLE = 'true'
BF_FREESTYLE = '#extern/freestyle'
BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
BF_SWIG = '${BF_FREESTYLE}/swig'
BF_SWIG_LIB = 'extern_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_NSPR = 'true' #WITH_BF_NSPR = 'true'
#BF_NSPR = $(LIBDIR)/nspr #BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
......
config/win32-vc-config.py
+ 10
− 0
View file @ 959f1a0f
...@@ -108,6 +108,16 @@ WITH_BF_YAFRAY = 'true' ...@@ -108,6 +108,16 @@ WITH_BF_YAFRAY = 'true'
WITH_BF_BINRELOC = 'false' WITH_BF_BINRELOC = 'false'
WITH_BF_FREESTYLE = 'true'
BF_FREESTYLE = '#extern/freestyle'
BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
BF_SWIG = '${BF_FREESTYLE}/swig'
BF_SWIG_LIB = 'extern_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_NSPR = 'true' #WITH_BF_NSPR = 'true'
#BF_NSPR = $(LIBDIR)/nspr #BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
......
extern/SConscript
+ 1
− 0
View file @ 959f1a0f
...@@ -11,6 +11,7 @@ if env['WITH_BF_BULLET']: ...@@ -11,6 +11,7 @@ if env['WITH_BF_BULLET']:
if env['WITH_BF_FREESTYLE']: if env['WITH_BF_FREESTYLE']:
SConscript(['freestyle/lib3ds/SConscript']) SConscript(['freestyle/lib3ds/SConscript'])
SConscript(['freestyle/swig/SConscript'])
if env['WITH_BF_INTERNATIONAL']: if env['WITH_BF_INTERNATIONAL']:
SConscript(['bFTGL/SConscript']) SConscript(['bFTGL/SConscript'])
......
source/blender/freestyle/SConscript
+ 15
− 9
View file @ 959f1a0f
#!/usr/bin/python #!/usr/bin/python
# import sys import sys
# Import ('env') Import ('env')
#
# sources = [''] sources = []
# defs = []
# incs = ' '
# incs += ' ' + env['BF_LIB3DS_INC'] incs = '#/extern/freestyle/lib3ds #/extern/freestyle/swig'
# incs += ' ' + env['BF_LIB3DS_INC']
# env.BlenderLib ( 'bf_freestyle', sources, Split(incs), Split(defs), libtype=['international','player'], priority=[0, 205] )
# env.BlenderLib (libname="bf_freestyle",
# sources=sources,
# includes=Split(incs),
# defines=defs,
# libtype=['blender'],
# priority = [15] )
\ No newline at end of file
tools/btools.py
+ 3
− 2
View file @ 959f1a0f
...@@ -66,7 +66,7 @@ def validate_arguments(args, bc): ...@@ -66,7 +66,7 @@ def validate_arguments(args, bc):
'BF_FANCY', 'BF_QUIET', 'BF_FANCY', 'BF_QUIET',
'BF_X264_CONFIG', 'BF_X264_CONFIG',
'BF_XVIDCORE_CONFIG', 'BF_XVIDCORE_CONFIG',
'BF_WITH_BF_FREESTYLE', 'BF_FREESTYLE', 'BF_FREESTYLE_SRC', 'BF_SWIG', 'BF_LIB3DS', 'BF_LIB3DS_LIB', 'BF_LIB3DS_LIBPATH', 'BF_LIB3DS_INC' 'BF_WITH_BF_FREESTYLE', 'BF_FREESTYLE', 'BF_FREESTYLE_SRC', 'BF_SWIG', 'BF_SWIG_LIB', 'BF_LIB3DS', 'BF_LIB3DS_LIB', 'BF_LIB3DS_LIBPATH', 'BF_LIB3DS_INC'
] ]
arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE', arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
...@@ -242,7 +242,8 @@ def read_opts(cfg, args): ...@@ -242,7 +242,8 @@ def read_opts(cfg, args):
('BF_FREESTYLE', 'Freestyle base path', ''), ('BF_FREESTYLE', 'Freestyle base path', ''),
('BF_FREESTYLE_SRC', 'Freestyle source path', ''), ('BF_FREESTYLE_SRC', 'Freestyle source path', ''),
('BF_SWIG', 'SWIG base path', ''), ('BF_SWIG', 'SWIG base path', ''),
('BF_LIB3DS', 'SWIG base path', ''), ('BF_SWIG_LIB', 'SWIG library', ''),
('BF_LIB3DS', 'lib3ds base path', ''),
('BF_LIB3DS_LIB', 'lib3ds library', ''), ('BF_LIB3DS_LIB', 'lib3ds library', ''),
('BF_LIB3DS_LIBPATH', 'lib3ds library path', ''), ('BF_LIB3DS_LIBPATH', 'lib3ds library path', ''),
('BF_LIB3DS_INC', 'lib3ds include path', ''), ('BF_LIB3DS_INC', 'lib3ds include path', ''),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment