[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16408] branches/soc-2008-mxcurioni: soc-2008-mxcurioni: corrected compilation issues ( remnants of extern_lib3ds)

Sun Sep 7 16:13:27 CEST 2008

Revision: 16408
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16408
Author:   mxcurioni
Date:     2008-09-07 16:13:26 +0200 (Sun, 07 Sep 2008)

Log Message:
-----------
soc-2008-mxcurioni: corrected compilation issues (remnants of extern_lib3ds)

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/SConstruct
    branches/soc-2008-mxcurioni/config/darwin-config.py
    branches/soc-2008-mxcurioni/config/linux2-config.py
    branches/soc-2008-mxcurioni/config/linuxcross-config.py
    branches/soc-2008-mxcurioni/config/openbsd3-config.py
    branches/soc-2008-mxcurioni/config/sunos5-config.py
    branches/soc-2008-mxcurioni/config/win32-mingw-config.py
    branches/soc-2008-mxcurioni/config/win32-vc-config.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
    branches/soc-2008-mxcurioni/tools/Blender.py
    branches/soc-2008-mxcurioni/tools/btools.py

Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================

--- branches/soc-2008-mxcurioni/SConstruct	2008-09-07 14:02:58 UTC (rev 16407)
+++ branches/soc-2008-mxcurioni/SConstruct	2008-09-07 14:13:26 UTC (rev 16408)
@@ -269,7 +269,7 @@
                 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/freestyle/swig/Makefile']:
+                'extern/xvidcore/build/generic/platform.inc']:
             if os.path.exists(confile):
                 print "clean file %s"%confile
                 os.remove(confile)

Modified: branches/soc-2008-mxcurioni/config/darwin-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/darwin-config.py	2008-09-07 14:02:58 UTC (rev 16407)
+++ branches/soc-2008-mxcurioni/config/darwin-config.py	2008-09-07 14:13:26 UTC (rev 16408)
@@ -161,14 +161,9 @@
 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_INC = '${BF_LIB3DS}'
 
+
+
 # WITH_BF_OPENEXR = 'true'
 # BF_OPENEXR = '${LCGDIR}/openexr'
 # BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'

Modified: branches/soc-2008-mxcurioni/config/linux2-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/linux2-config.py	2008-09-07 14:02:58 UTC (rev 16407)
+++ branches/soc-2008-mxcurioni/config/linux2-config.py	2008-09-07 14:13:26 UTC (rev 16408)
@@ -87,14 +87,9 @@
 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_INC = '${BF_LIB3DS}'
 
+
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2008-mxcurioni/config/linuxcross-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/linuxcross-config.py	2008-09-07 14:02:58 UTC (rev 16407)
+++ branches/soc-2008-mxcurioni/config/linuxcross-config.py	2008-09-07 14:13:26 UTC (rev 16408)
@@ -7,14 +7,8 @@
 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_INC = '${BF_LIB3DS}'
 
+
 ###########################
 
 BF_PYTHON = LIBDIR + '/python'

Modified: branches/soc-2008-mxcurioni/config/openbsd3-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/openbsd3-config.py	2008-09-07 14:02:58 UTC (rev 16407)
+++ branches/soc-2008-mxcurioni/config/openbsd3-config.py	2008-09-07 14:13:26 UTC (rev 16408)
@@ -81,14 +81,9 @@
 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_INC = '${BF_LIB3DS}'
 
+
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2008-mxcurioni/config/sunos5-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/sunos5-config.py	2008-09-07 14:02:58 UTC (rev 16407)
+++ branches/soc-2008-mxcurioni/config/sunos5-config.py	2008-09-07 14:13:26 UTC (rev 16408)
@@ -83,14 +83,9 @@
 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_INC = '${BF_LIB3DS}'
 
+
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2008-mxcurioni/config/win32-mingw-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/win32-mingw-config.py	2008-09-07 14:02:58 UTC (rev 16407)
+++ branches/soc-2008-mxcurioni/config/win32-mingw-config.py	2008-09-07 14:13:26 UTC (rev 16408)
@@ -98,14 +98,9 @@
 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_INC = '${BF_LIB3DS}'
 
+
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2008-mxcurioni/config/win32-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/win32-vc-config.py	2008-09-07 14:02:58 UTC (rev 16407)
+++ branches/soc-2008-mxcurioni/config/win32-vc-config.py	2008-09-07 14:13:26 UTC (rev 16408)
@@ -109,14 +109,9 @@
 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_INC = '${BF_LIB3DS}'
 
+
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript	2008-09-07 14:02:58 UTC (rev 16407)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript	2008-09-07 14:13:26 UTC (rev 16408)
@@ -8,9 +8,7 @@
 
 incs += '../blenkernel ../blenlib ../imbuf ../makesdna ../python '
 incs += '../render/extern/include ../render/intern/include ../include ../src'
-incs += ' #/extern/freestyle/lib3ds' 
 incs += ' ' + env['BF_PYTHON_INC']	
-incs += ' ' + env['BF_LIB3DS_INC']
 incs += ' ' + env['BF_PNG_INC']
 
 ########################################################

Modified: branches/soc-2008-mxcurioni/tools/Blender.py
===================================================================
--- branches/soc-2008-mxcurioni/tools/Blender.py	2008-09-07 14:02:58 UTC (rev 16407)
+++ branches/soc-2008-mxcurioni/tools/Blender.py	2008-09-07 14:13:26 UTC (rev 16408)
@@ -158,8 +158,6 @@
         syslibs += Split(lenv['BF_OPENEXR_LIB'])
     if lenv['WITH_BF_FFMPEG']:
         syslibs += Split(lenv['BF_FFMPEG_LIB'])
-    if lenv['WITH_BF_FREESTYLE']:
-        syslibs += Split(lenv['BF_LIB3DS_LIB'])
     syslibs += Split(lenv['BF_SDL_LIB'])
     if not lenv['WITH_BF_STATICOPENGL']:
         syslibs += Split(lenv['BF_OPENGL_LIB'])

Modified: branches/soc-2008-mxcurioni/tools/btools.py
===================================================================
--- branches/soc-2008-mxcurioni/tools/btools.py	2008-09-07 14:02:58 UTC (rev 16407)
+++ branches/soc-2008-mxcurioni/tools/btools.py	2008-09-07 14:13:26 UTC (rev 16408)
@@ -66,7 +66,7 @@
             'BF_FANCY', 'BF_QUIET',
             'BF_X264_CONFIG',
             'BF_XVIDCORE_CONFIG',
-			'BF_WITH_BF_FREESTYLE', 'BF_FREESTYLE', 'BF_FREESTYLE_SRC', 'BF_SWIG', 'BF_SWIG_LIB', 'BF_LIB3DS', 'BF_LIB3DS_LIB', 'BF_LIB3DS_INC'
+			'BF_WITH_BF_FREESTYLE'
             ]
 
     arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
@@ -251,13 +251,6 @@
         ('BF_WINTAB_INC', 'WinTab include dir', ''),
 
 		(BoolOption('WITH_BF_FREESTYLE', 'Use Freestyle if true', 'true')),
-        ('BF_FREESTYLE', 'Freestyle base path', ''),
-        ('BF_FREESTYLE_SRC', 'Freestyle source path', ''),
-        ('BF_SWIG', 'SWIG base path', ''),
-        ('BF_SWIG_LIB', 'SWIG library', ''),
-        ('BF_LIB3DS', 'lib3ds base path', ''),
-        ('BF_LIB3DS_LIB', 'lib3ds library', ''),
-        ('BF_LIB3DS_INC', 'lib3ds include path', ''),
 
 ##
 ##WITH_BF_NSPR = 'true'



