[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23628] branches/soc-2008-mxcurioni/source /blender/freestyle: fixed headers and SConscript to have successful build
Maxime Curioni
maxime.curioni at gmail.com
Mon Oct 5 03:27:39 CEST 2009
Revision: 23628
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23628
Author: mxcurioni
Date: 2009-10-05 03:27:35 +0200 (Mon, 05 Oct 2009)
Log Message:
-----------
fixed headers and SConscript to have successful build
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/Controller.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript 2009-10-05 00:40:33 UTC (rev 23627)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript 2009-10-05 01:27:35 UTC (rev 23628)
@@ -48,10 +48,14 @@
prefix = 'intern/rendering'
rendering_sources = env.Glob(prefix + '/GL*.cpp')
-# app / app_blender
-prefix = 'intern/app_blender'
-app_sources = env.Glob(prefix + '/*.cpp')
+# application
+prefix = 'intern/application'
+application_sources = env.Glob(prefix + '/*.cpp')
+# blender_interface
+prefix = 'intern/blender_interface'
+interface_sources = env.Glob(prefix + '/*.cpp')
+
# Python
prefix = 'intern/python'
python_sources = env.Glob(prefix + '/*.cpp') \
@@ -61,7 +65,7 @@
sources = system_sources + image_sources + geometry_sources + scene_graph_sources \
+ winged_edge_sources + view_map_sources + stroke_sources + rendering_sources \
- + app_sources + python_sources
+ + application_sources + interface_sources + python_sources
env.BlenderLib (libname="bf_freestyle",
sources=sources,
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/Controller.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/Controller.cpp 2009-10-05 00:40:33 UTC (rev 23627)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/Controller.cpp 2009-10-05 01:27:35 UTC (rev 23628)
@@ -56,8 +56,8 @@
#include "../system/StringUtils.h"
-#include "../scene_graph/BlenderFileLoader.h"
-#include "../stroke/BlenderStrokeRenderer.h"
+#include "../blender_interface/BlenderFileLoader.h"
+#include "../blender_interface/BlenderStrokeRenderer.h"
#ifdef __cplusplus
extern "C" {
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h 2009-10-05 00:40:33 UTC (rev 23627)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h 2009-10-05 01:27:35 UTC (rev 23628)
@@ -5,10 +5,10 @@
# include <float.h>
# include "../system/FreestyleConfig.h"
-# include "NodeGroup.h"
-# include "NodeTransform.h"
-# include "NodeShape.h"
-# include "IndexedFaceSet.h"
+# include "../scene_graph/NodeGroup.h"
+# include "../scene_graph/NodeTransform.h"
+# include "../scene_graph/NodeShape.h"
+# include "../scene_graph/IndexedFaceSet.h"
# include "../geometry/BBox.h"
# include "../geometry/Geom.h"
# include "../geometry/GeomCleaner.h"
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp 2009-10-05 00:40:33 UTC (rev 23627)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp 2009-10-05 01:27:35 UTC (rev 23628)
@@ -1,6 +1,6 @@
# include "BlenderStrokeRenderer.h"
-# include "Canvas.h"
-# include "../app_blender/AppConfig.h"
+# include "../stroke/Canvas.h"
+# include "../application/AppConfig.h"
# include "../rendering/GLStrokeRenderer.h"
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h 2009-10-05 00:40:33 UTC (rev 23627)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h 2009-10-05 01:27:35 UTC (rev 23628)
@@ -2,7 +2,7 @@
# define BLENDERSTROKERENDERER_H
# include "../system/FreestyleConfig.h"
-# include "StrokeRenderer.h"
+# include "../stroke/StrokeRenderer.h"
#ifdef __cplusplus
extern "C" {
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp 2009-10-05 00:40:33 UTC (rev 23627)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp 2009-10-05 01:27:35 UTC (rev 23628)
@@ -1,7 +1,7 @@
-#include "AppView.h"
-#include "Controller.h"
-#include "AppConfig.h"
-#include "AppCanvas.h"
+#include "../application/AppView.h"
+#include "../application/Controller.h"
+#include "../application/AppConfig.h"
+#include "../application/AppCanvas.h"
#include <iostream>
#include <map>
More information about the Bf-blender-cvs
mailing list