soc-2008-mxcurioni: swig compiles as independent library
authorMaxime Curioni <maxime.curioni@gmail.com>
Tue, 6 May 2008 17:23:27 +0000 (17:23 +0000)
committerMaxime Curioni <maxime.curioni@gmail.com>
Tue, 6 May 2008 17:23:27 +0000 (17:23 +0000)
SConstruct
config/darwin-config.py
config/linux2-config.py
config/linuxcross-config.py
config/openbsd3-config.py
config/sunos5-config.py
config/win32-mingw-config.py
config/win32-vc-config.py
extern/SConscript
source/blender/freestyle/SConscript
tools/btools.py

index 90092c51573d4e06a994724eb2f50076d692fdd0..341638c0e0ccf7f0d7c189201a629dc41fdd8a13 100644 (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:
index 856317cd627f33610c12bfb393604bd8b529f197..9ceb1d1644b044c18b5c2d60c12bda2a5b0f0d12 100644 (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'
index 4d8b5c97512862b65233319a26aa52262dba0f90..3c8a48d12bc58ccd7e3955461f46dff1ac109220 100644 (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
index e6c4e8769b42dee8621414b15044f9857bbe6111..886b9f93f3fdf85e38d9aa14a5b2db50bb47b061 100644 (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}'
index f7f254973af9b42b106713d7be106af4a81fc05d..ad4891a0098a279c483aa7cec394cde4589cef51 100644 (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
index b3ca0e267ff117a4b6be809178da8e325b13fd42..6581ad2b692b5b0c1694d90dd4bdef393867e0b9 100644 (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
index d9fd6ce8d4f18657649148ccd0a81c8b4c410442..b0a3c3ae18d28a357bf75b486e65eaecf9b48695 100644 (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
index 32b6597b5d55eda149f52615642cd376808585cf..849b153378f6568566792bf98621b520fadac19a 100644 (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
index 8ab451a8024b43edf0c051e7eb58a072a56d66e5..7997981b7f2fd9a6a04baa10b059f30c6f565564 100644 (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'])
index ce8b9d0f2247a9ff8fd4f140e300487dbac76eab..7e859e58c589ffa0ca34e45df9819c9549175a5d 100644 (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] )
\ No newline at end of file
index 8158bf6cfcc07ca84d9668e04107699404a30e5d..deab2e687b6bb35e91abb963fa362946bc14b015 100755 (executable)
@@ -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', ''),