archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

soc-2008-mxcurioni: swig compiles as independent library

Browse Source
This commit is contained in:
Maxime Curioni
2008-05-06 17:23:27 +00:00
parent 914a4d1a6c
commit 959f1a0f92
11 changed files with 86 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SConstruct
View File

@@ -269,7 +269,7 @@ if not quickie and do_clean:
print "clean dir %s"%(B.root_build_dir+dir)
shutil.rmtree(B.root_build_dir+dir)
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):
print "clean file %s"%confile
os.remove(confile)
@@ -340,12 +340,15 @@ if env['WITH_BF_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')
##### Now define some targets
#------------ INSTALL
#-- binaries
blenderinstall = []
if env['OURPLATFORM']=='darwin':
for prg in B.program_list:

1
config/darwin-config.py
View File

@@ -164,6 +164,7 @@ 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'

10
config/linux2-config.py
View File

@@ -86,6 +86,16 @@ BF_SOLID_LIB = 'extern_solid'
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'
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

12
config/linuxcross-config.py
View File

@@ -6,6 +6,18 @@ BF_VERSE_INCLUDE = "#extern/verse/dist"
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_VERSION = '2.5'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'

10
config/openbsd3-config.py
View File

@@ -80,6 +80,16 @@ BF_SOLID_LIB = 'extern_solid'
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'
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

10
config/sunos5-config.py
View File

@@ -82,6 +82,16 @@ BF_SOLID_LIB = 'extern_solid'
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'
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

10
config/win32-mingw-config.py
View File

@@ -97,6 +97,16 @@ BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
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'
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

10
config/win32-vc-config.py
View File

@@ -108,6 +108,16 @@ WITH_BF_YAFRAY = 'true'
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'
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

1
extern/SConscript vendored
View File

@@ -11,6 +11,7 @@ if env['WITH_BF_BULLET']:
if env['WITH_BF_FREESTYLE']:
SConscript(['freestyle/lib3ds/SConscript'])
SConscript(['freestyle/swig/SConscript'])
if env['WITH_BF_INTERNATIONAL']:
SConscript(['bFTGL/SConscript'])

24
source/blender/freestyle/SConscript
View File

@@ -1,10 +1,16 @@
#!/usr/bin/python
# import sys
# Import ('env')
#
# sources = ['']
#
# incs = ' '
# incs += ' ' + env['BF_LIB3DS_INC']
#
# env.BlenderLib ( 'bf_freestyle', sources, Split(incs), Split(defs), libtype=['international','player'], priority=[0, 205] )
import sys
Import ('env')
sources = []
defs = []
incs = '#/extern/freestyle/lib3ds #/extern/freestyle/swig'
incs += ' ' + env['BF_LIB3DS_INC']
# env.BlenderLib (libname="bf_freestyle",
# sources=sources,
# includes=Split(incs),
# defines=defs,
# libtype=['blender'],
# priority = [15] )

5
tools/btools.py
View File

@@ -66,7 +66,7 @@ def validate_arguments(args, bc):
'BF_FANCY', 'BF_QUIET',
'BF_X264_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',
@@ -242,7 +242,8 @@ def read_opts(cfg, args):
('BF_FREESTYLE', 'Freestyle base path', ''),
('BF_FREESTYLE_SRC', 'Freestyle source 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_LIBPATH', 'lib3ds library path', ''),
('BF_LIB3DS_INC', 'lib3ds include path', ''),