Revision: 16825
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16825
Author: mxcurioni
Date: 2008-09-29 17:50:50 +0200 (Mon, 29 Sep 2008)
Log Message:
-----------
soc-2008-mxcurioni: moved the style module and data files to Blender's standard
directory (.blender/scripts/freestyle), cleaned up some useless files. As of
this revision, the environment variable FREESTYLE_BLENDER_DIR is NOT needed
anymore
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppConfig.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/api.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_old/
Removed Paths:
-------------
branches/soc-2008-mxcurioni/source/blender/freestyle/data/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Config.pri
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Freestyle-vc7-debug.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Freestyle-vc7-release.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Freestyle-vc8-debug.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Freestyle-vc8-release.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Makefile.pro
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/build_bundle.macosx.py
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/libconfig.pri
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/makedsp.vcnet.debug.bat
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/makedsp.vcnet.release.bat
branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules/
branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppConfig.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppConfig.cpp
2008-09-29 15:02:20 UTC (rev 16824)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppConfig.cpp
2008-09-29 15:50:50 UTC (rev 16825)
@@ -22,20 +22,23 @@
#include <iostream>
#include "../system/StringUtils.h"
-
using namespace std;
+extern "C" {
+ #include "api2_2x/EXPP_interface.h"
+}
+
namespace Config {
Path* Path::_pInstance = 0;
Path::Path() {
// get the root directory
//soc
- setRootDir(getEnvVar("FREESTYLE_BLENDER_DIR"));
+ setRootDir( bpy_gethome(1) );
_pInstance = this;
}
void Path::setRootDir(const string& iRootDir) {
- _ProjectDir = iRootDir;
+ _ProjectDir = iRootDir + string(DIR_SEP.c_str()) + "freestyle";
_ModelsPath = "";
_PatternsPath = _ProjectDir + string(DIR_SEP.c_str()) + "data"
+ string(DIR_SEP.c_str()) + "textures" +
string(DIR_SEP.c_str())
@@ -43,9 +46,8 @@
_BrushesPath = _ProjectDir + string(DIR_SEP.c_str()) + "data"
+ string(DIR_SEP.c_str()) + "textures" +
string(DIR_SEP.c_str())
+ "brushes" + string(DIR_SEP.c_str());
- _PythonPath = _ProjectDir + string(DIR_SEP.c_str()) + "python"
- + string(PATH_SEP.c_str()) + _ProjectDir +
string(DIR_SEP.c_str())
- + "style_modules_blender" + string(DIR_SEP.c_str()) ;
+ _PythonPath = _ProjectDir + string(DIR_SEP.c_str())
++ "style_modules" + string(DIR_SEP.c_str()) ;
if (getenv("PYTHONPATH")) {
_PythonPath += string(PATH_SEP.c_str()) +
string(getenv("PYTHONPATH"));
}
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/api.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/api.cpp
2008-09-29 15:02:20 UTC (rev 16824)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/api.cpp
2008-09-29 15:50:50 UTC (rev 16825)
@@ -48,7 +48,7 @@
controller->Clear();
if( strlen(style_module) == 0 ){
- string path( pathconfig->getProjectDir() +
Config::DIR_SEP + "style_modules_blender" + Config::DIR_SEP + "contour.py" );
+ string path( pathconfig->getProjectDir() +
Config::DIR_SEP + "style_modules" + Config::DIR_SEP + "contour.py" );
strcpy( style_module, path.c_str() );
}
Deleted: branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Config.pri
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Config.pri
2008-09-29 15:02:20 UTC (rev 16824)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Config.pri
2008-09-29 15:50:50 UTC (rev 16825)
@@ -1,176 +0,0 @@
-# This file should be viewed as a -*- mode: Makefile -*-
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# A p p l i c a t i o n & L i b r a r i e s #
-# b u i l d c o n f i g u r a t i o n #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-#
-# APPLICATION
-#
-#######################################
-
-APPNAME = Freestyle
-APPVERSION_MAJ = 2
-APPVERSION_MID = 2
-APPVERSION_MIN = 0
-APPVERSION = $${APPVERSION_MAJ}.$${APPVERSION_MID}.$${APPVERSION_MIN}
-
-PYTHON_VERSION_MAJ = 2
-PYTHON_VERSION_MIN = 5
-
-LIB3DS_VERSION_MAJ = 1
-LIB3DS_VERSION_MIN = 30
-
-#
-# CONFIG
-#
-#######################################
-
-CONFIG -= debug release ReleaseBuild Release build_pass
precompile_header debug_and_release debug_and_release_target
-CONFIG *= qt shared stl exceptions rtti thread
-CONFIG *= release # debug or release
-CONFIG *= warn_off # warn_off or warn_on
-mac:CONFIG += x86
-#mac:CONFIG += ppc
-#mac:CONFIG *= lib_bundle
-
-#mac:QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
-#message($$CONFIG)
-#CONFIG *= static
-#CONFIG *= profiling
-
-
-
-QT += opengl
-
-#
-# LIBRARIES
-#
-#######################################
-
-debug{
- LIB_GEOMETRY = $${APPNAME}Geometry_d
- LIB_IMAGE = $${APPNAME}Image_d
- LIB_RENDERING = $${APPNAME}Rendering_d
- LIB_SCENE_GRAPH = $${APPNAME}SceneGraph_d
- LIB_SYSTEM = $${APPNAME}System_d
- LIB_VIEW_MAP = $${APPNAME}ViewMap_d
- LIB_STROKE = $${APPNAME}Stroke_d
- LIB_WINGED_EDGE = $${APPNAME}WingedEdge_d
-}else{
- LIB_GEOMETRY = $${APPNAME}Geometry
- LIB_IMAGE = $${APPNAME}Image
- LIB_RENDERING = $${APPNAME}Rendering
- LIB_SCENE_GRAPH = $${APPNAME}SceneGraph
- LIB_SYSTEM = $${APPNAME}System
- LIB_VIEW_MAP = $${APPNAME}ViewMap
- LIB_STROKE = $${APPNAME}Stroke
- LIB_WINGED_EDGE = $${APPNAME}WingedEdge
-}
-
-LIBVERSION = $${APPVERSION_MAJ}.$${APPVERSION_MID}
-
-
-#
-# FLAGS
-#
-#######################################
-
-win32:QMAKE_CXXFLAGS *= /GR /GX
-win32:QMAKE_CFLAGS *= /GR /GX
-irix-n32:QMAKE_CFLAGS *= -LANG:std
-irix-n32:QMAKE_CXXFLAGS *= -LANG:std
-linux-g++:QMAKE_CFLAGS *= -Wno-deprecated
-linux-g++:QMAKE_CXXFLAGS *= -Wno-deprecated
-cygwin-g++:QMAKE_CFLAGS *= -Wno-deprecated
-cygwin-g++:QMAKE_CXXFLAGS *= -Wno-deprecated -mno-win32
-mac:QMAKE_CFLAGS *= -Wno-deprecated
-mac:QMAKE_CXXFLAGS *= -Wno-deprecated
-
-linux-g++:QMAKE_CFLAGS_RELEASE = -O3 -funroll-loops -fomit-frame-pointer
-ffast-math -march=i686
-linux-g++:QMAKE_CXXFLAGS_RELEASE = -O3 -funroll-loops -fomit-frame-pointer
-ffast-math -march=i686
-cygwin-g++:QMAKE_CFLAGS_RELEASE = -O3 -funroll-loops -fomit-frame-pointer
-ffast-math -march=i686
-cygwin-g++:QMAKE_CXXFLAGS_RELEASE = -O3 -funroll-loops -fomit-frame-pointer
-ffast-math -march=i686
-mac:QMAKE_CFLAGS_RELEASE = -O3 -funroll-loops -fomit-frame-pointer
-ffast-math -march=i686
-mac:QMAKE_CXXFLAGS_RELEASE = -O3 -funroll-loops -fomit-frame-pointer
-ffast-math -march=i686
-
-profiling {
- linux-g++:QMAKE_CFLAGS_DEBUG = -pg
- linux-g++:QMAKE_CXXFLAGS_DEBUG = -pg
- linux-g++:QMAKE_LFLAGS_DEBUG = -pg
- cygwin-g++:QMAKE_CFLAGS_DEBUG = -pg
- cygwin-g++:QMAKE_CXXFLAGS_DEBUG = -pg
- cygwin-g++:QMAKE_LFLAGS_DEBUG = -pg
- mac:QMAKE_CFLAGS_DEBUG = -pg
- mac:QMAKE_CXXFLAGS_DEBUG = -pg
- mac:QMAKE_LFLAGS_DEBUG = -pg
-}
-
-#
-# DEFINES
-#
-#######################################
-
-win32:DEFINES *= WIN32 QT_DLL QT_THREAD_SUPPORT
-linux-g++:DEFINES *= LINUX
-cygwin-g++:DEFINES *= CYGWIN
-irix-n32:DEFINES *= IRIX
-mac:DEFINES *= MACOSX
-
-#
-# BUILD DIRECTORIES (RELATIVE)
-#
-#######################################
-
-release {
- win32 {
- REL_OBJECTS_DIR = \\win32\\release\\obj
- REL_DESTDIR = \\win32\\release
- }
- linux-g++ {
- REL_OBJECTS_DIR = linux-g++/release/obj
- REL_DESTDIR = linux-g++/release
- }
- cygwin-g++ {
- REL_OBJECTS_DIR = cygwin-g++/release/obj
- REL_DESTDIR = cygwin-g++/release
- }
- irix-n32 {
- REL_OBJECTS_DIR = irix-n32/release/obj
- REL_DESTDIR = irix-n32/release
- }
- mac {
- REL_OBJECTS_DIR = macosx/release/obj
- REL_DESTDIR = macosx/release
- }
-}
-debug {
- win32 {
- REL_OBJECTS_DIR = \\win32\\debug\\obj
- REL_DESTDIR = \\win32\\debug
- }
- linux-g++ {
- REL_OBJECTS_DIR = linux-g++/debug/obj
- REL_DESTDIR = linux-g++/debug
- }
- cygwin-g++ {
- REL_OBJECTS_DIR = cygwin-g++/debug/obj
- REL_DESTDIR = cygwin-g++/debug
- }
- irix-n32 {
- REL_OBJECTS_DIR = irix-n32/debug/obj
- REL_DESTDIR = irix-n32/debug
- }
- mac {
- REL_OBJECTS_DIR = macosx/debug/obj
- REL_DESTDIR = macosx/debug
- }
-}
-
-#
-# INSTALL
-#
-#######################################
-
-#QMAKE_COPY_FILE = $${QMAKE_COPY} -P
Deleted:
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Freestyle-vc7-debug.sln
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Freestyle-vc7-debug.sln
2008-09-29 15:02:20 UTC (rev 16824)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Freestyle-vc7-debug.sln
2008-09-29 15:50:50 UTC (rev 16825)
@@ -1,113 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Freestyle_d",
"app\app_d.vcproj", "{0BC94A80-9E3E-40D8-B2CF-6594F96361C5}"
- ProjectSection(ProjectDependencies) = postProject
- {DFCED64E-AEFA-4D06-8609-DE23A69D0361} =
{DFCED64E-AEFA-4D06-8609-DE23A69D0361}
- {AF37DD50-8CD3-4339-AB32-C6F8F770CB30} =
{AF37DD50-8CD3-4339-AB32-C6F8F770CB30}
- {FA76B552-8A89-4A50-92F7-A77935515005} =
{FA76B552-8A89-4A50-92F7-A77935515005}
- {3E1C0A57-8206-402F-A12E-3B100F121DDE} =
{3E1C0A57-8206-402F-A12E-3B100F121DDE}
- {9F2B9C57-F57F-4A8A-9590-6DDD1E51433C} =
{9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}
- {4C44396A-8016-4360-8F5C-35CA6CC282BD} =
{4C44396A-8016-4360-8F5C-35CA6CC282BD}
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} =
{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
- {858093EF-6B95-4D0F-AA0A-CF187C6F369F} =
{858093EF-6B95-4D0F-AA0A-CF187C6F369F}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleGeometry_d",
"geometry\geometry_d.vcproj", "{3E1C0A57-8206-402F-A12E-3B100F121DDE}"
- ProjectSection(ProjectDependencies) = postProject
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} =
{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleImage_d",
"image\image_d.vcproj", "{4C44396A-8016-4360-8F5C-35CA6CC282BD}"
- ProjectSection(ProjectDependencies) = postProject
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} =
{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleRendering_d",
"rendering\rendering_d.vcproj", "{9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}"
- ProjectSection(ProjectDependencies) = postProject
- {DFCED64E-AEFA-4D06-8609-DE23A69D0361} =
{DFCED64E-AEFA-4D06-8609-DE23A69D0361}
- {3E1C0A57-8206-402F-A12E-3B100F121DDE} =
{3E1C0A57-8206-402F-A12E-3B100F121DDE}
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} =
{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
- {858093EF-6B95-4D0F-AA0A-CF187C6F369F} =
{858093EF-6B95-4D0F-AA0A-CF187C6F369F}
- EndProjectSection
-EndProject
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
