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

SConstruct

@@ -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/freestyle/swig/Makefile']:
+                'extern/xvidcore/build/generic/platform.inc']:
             if os.path.exists(confile):
                 print "clean file %s"%confile
                 os.remove(confile)

config/darwin-config.py

@@ -161,13 +161,8 @@ 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_INC = '${BF_LIB3DS}'
 
 # WITH_BF_OPENEXR = 'true'
 # BF_OPENEXR = '${LCGDIR}/openexr'

config/linux2-config.py

@@ -87,13 +87,8 @@ 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_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr

config/linuxcross-config.py

@@ -7,13 +7,7 @@ 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_INC = '${BF_LIB3DS}'
 
 ###########################
 

config/openbsd3-config.py

@@ -81,13 +81,8 @@ 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_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr

config/sunos5-config.py

@@ -83,13 +83,8 @@ 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_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr

config/win32-mingw-config.py

@@ -98,13 +98,8 @@ 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_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr

config/win32-vc-config.py

@@ -109,13 +109,8 @@ 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_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr

source/blender/freestyle/SConscript

@@ -8,9 +8,7 @@ incs = ''
 
 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']
 
 ########################################################

tools/Blender.py

@@ -158,8 +158,6 @@ def setup_syslibs(lenv):
         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'])

tools/btools.py

@@ -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_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 @@ def read_opts(cfg, args):
         ('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'