soc-2008-mxcurioni: towards Freestyle compilation, removing Qt's QString and QImage dependencies. Up to this commit, the following directories compile well (and without any warning): system, image, geometry, graph, winged_edge, view_map, stroke.

Modified code is commented by //soc and unused variables by //soc unused

1 files changed, 55 insertions, 7 deletions

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 7e859e58c58..2bc08822a6e 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -4,13 +4,61 @@ Import ('env')
 
 sources = []
 defs = []
+incs = ''
 
-incs = '#/extern/freestyle/lib3ds #/extern/freestyle/swig'
+incs += '../blenkernel ../blenlib ../imbuf ../makesdna'
+# incs += ' #/extern/freestyle/lib3ds #/extern/freestyle/swig'
+incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_LIB3DS_INC']
+incs += ' ' + env['BF_PNG_INC']
 
-# env.BlenderLib (libname="bf_freestyle",
-# 				sources=sources,
-#                 includes=Split(incs),
-#                 defines=defs,
-#                 libtype=['blender'],
-#                 priority = [15] )
\ No newline at end of file
+########################################################
+#	folders sources 
+########################################################
+
+#	system
+prefix = 'intern/system'
+system_sources = env.Glob(prefix + '/*.cpp')
+
+#	image
+prefix = 'intern/image'
+image_sources = env.Glob(prefix + '/*.cpp')
+
+#	geometry
+prefix = 'intern/geometry'
+geometry_sources = env.Glob(prefix + '/*.cpp')
+
+#	scene_graph
+prefix = 'intern/scene_graph'
+scene_graph_sources = env.Glob(prefix + '/*.cpp')
+
+#	winged_edge
+prefix = 'intern/winged_edge'
+winged_edge_sources = env.Glob(prefix + '/*.cpp')
+
+#	view_map
+prefix = 'intern/view_map'
+view_map_sources = env.Glob(prefix + '/*.cpp')
+
+#	stroke
+prefix = 'intern/stroke'
+stroke_sources = env.Glob(prefix + '/*.cpp')
+
+#	rendering
+# 	app
+
+sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources + \
+			winged_edge_sources + view_map_sources + stroke_sources
+#print sources
+
+env.BlenderLib (libname="bf_freestyle",
+				sources=sources,
+                includes=Split(incs),
+                defines=defs,
+                libtype=['blender'],
+                priority = [15] )
+
+########################################################
+# SWIG
+########################################################
+#	swig
\ No newline at end of file