Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Curioni <maxime.curioni@gmail.com>2008-09-29 19:50:50 +0400
committerMaxime Curioni <maxime.curioni@gmail.com>2008-09-29 19:50:50 +0400
commit7e3a4c84e42b92c11e61a7102d29c4aa9b61291d (patch)
tree41f261cca99519121a7368ce0a521611b576f81a /source/blender/freestyle/misc
parente71af35f58d63a1d2c3dabdc72f1742dcbb505bd (diff)
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
Diffstat (limited to 'source/blender/freestyle/misc')
-rwxr-xr-xsource/blender/freestyle/misc/Config.pri176
-rwxr-xr-xsource/blender/freestyle/misc/Freestyle-vc7-debug.sln113
-rwxr-xr-xsource/blender/freestyle/misc/Freestyle-vc7-release.sln111
-rwxr-xr-xsource/blender/freestyle/misc/Freestyle-vc8-debug.sln87
-rwxr-xr-xsource/blender/freestyle/misc/Freestyle-vc8-release.sln87
-rwxr-xr-xsource/blender/freestyle/misc/Makefile.pro18
-rwxr-xr-xsource/blender/freestyle/misc/build_bundle.macosx.py183
-rwxr-xr-xsource/blender/freestyle/misc/libconfig.pri110
-rwxr-xr-xsource/blender/freestyle/misc/makedsp.vcnet.debug.bat25
-rwxr-xr-xsource/blender/freestyle/misc/makedsp.vcnet.release.bat25
10 files changed, 0 insertions, 935 deletions
diff --git a/source/blender/freestyle/misc/Config.pri b/source/blender/freestyle/misc/Config.pri
deleted file mode 100755
index 68763dba502..00000000000
--- a/source/blender/freestyle/misc/Config.pri
+++ /dev/null
@@ -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
diff --git a/source/blender/freestyle/misc/Freestyle-vc7-debug.sln b/source/blender/freestyle/misc/Freestyle-vc7-debug.sln
deleted file mode 100755
index 937f3f9faf9..00000000000
--- a/source/blender/freestyle/misc/Freestyle-vc7-debug.sln
+++ /dev/null
@@ -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
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSceneGraph_d", "scene_graph\scene_graph_d.vcproj", "{858093EF-6B95-4D0F-AA0A-CF187C6F369F}"
- ProjectSection(ProjectDependencies) = postProject
- {3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleStroke_d", "stroke\stroke_d.vcproj", "{DFCED64E-AEFA-4D06-8609-DE23A69D0361}"
- ProjectSection(ProjectDependencies) = postProject
- {FA76B552-8A89-4A50-92F7-A77935515005} = {FA76B552-8A89-4A50-92F7-A77935515005}
- {3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSystem_d", "system\system_d.vcproj", "{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleViewMap_d", "view_map\view_map_d.vcproj", "{FA76B552-8A89-4A50-92F7-A77935515005}"
- ProjectSection(ProjectDependencies) = postProject
- {AF37DD50-8CD3-4339-AB32-C6F8F770CB30} = {AF37DD50-8CD3-4339-AB32-C6F8F770CB30}
- {3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
- {4C44396A-8016-4360-8F5C-35CA6CC282BD} = {4C44396A-8016-4360-8F5C-35CA6CC282BD}
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleWingedEdge_d", "winged_edge\winged_edge_d.vcproj", "{AF37DD50-8CD3-4339-AB32-C6F8F770CB30}"
- ProjectSection(ProjectDependencies) = postProject
- {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
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectDependencies) = postSolution
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Debug.ActiveCfg = Debug|Win32
- {0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Debug.Build.0 = Debug|Win32
- {0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Release.ActiveCfg = Debug|Win32
- {0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Release.Build.0 = Debug|Win32
- {3E1C0A57-8206-402F-A12E-3B100F121DDE}.Debug.ActiveCfg = Debug|Win32
- {3E1C0A57-8206-402F-A12E-3B100F121DDE}.Debug.Build.0 = Debug|Win32
- {3E1C0A57-8206-402F-A12E-3B100F121DDE}.Release.ActiveCfg = Debug|Win32
- {3E1C0A57-8206-402F-A12E-3B100F121DDE}.Release.Build.0 = Debug|Win32
- {4C44396A-8016-4360-8F5C-35CA6CC282BD}.Debug.ActiveCfg = Debug|Win32
- {4C44396A-8016-4360-8F5C-35CA6CC282BD}.Debug.Build.0 = Debug|Win32
- {4C44396A-8016-4360-8F5C-35CA6CC282BD}.Release.ActiveCfg = Debug|Win32
- {4C44396A-8016-4360-8F5C-35CA6CC282BD}.Release.Build.0 = Debug|Win32
- {9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Debug.ActiveCfg = Debug|Win32
- {9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Debug.Build.0 = Debug|Win32
- {9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Release.ActiveCfg = Debug|Win32
- {9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Release.Build.0 = Debug|Win32
- {858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Debug.ActiveCfg = Debug|Win32
- {858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Debug.Build.0 = Debug|Win32
- {858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Release.ActiveCfg = Debug|Win32
- {858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Release.Build.0 = Debug|Win32
- {DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Debug.ActiveCfg = Debug|Win32
- {DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Debug.Build.0 = Debug|Win32
- {DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Release.ActiveCfg = Debug|Win32
- {DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Release.Build.0 = Debug|Win32
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Debug.ActiveCfg = Debug|Win32
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Debug.Build.0 = Debug|Win32
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Release.ActiveCfg = Debug|Win32
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Release.Build.0 = Debug|Win32
- {FA76B552-8A89-4A50-92F7-A77935515005}.Debug.ActiveCfg = Debug|Win32
- {FA76B552-8A89-4A50-92F7-A77935515005}.Debug.Build.0 = Debug|Win32
- {FA76B552-8A89-4A50-92F7-A77935515005}.Release.ActiveCfg = Release|Win32
- {FA76B552-8A89-4A50-92F7-A77935515005}.Release.Build.0 = Release|Win32
- {AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Debug.ActiveCfg = Debug|Win32
- {AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Debug.Build.0 = Debug|Win32
- {AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Release.ActiveCfg = Debug|Win32
- {AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Release.Build.0 = Debug|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
diff --git a/source/blender/freestyle/misc/Freestyle-vc7-release.sln b/source/blender/freestyle/misc/Freestyle-vc7-release.sln
deleted file mode 100755
index 74d5dc77f86..00000000000
--- a/source/blender/freestyle/misc/Freestyle-vc7-release.sln
+++ /dev/null
@@ -1,111 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Freestyle", "app\app.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", "geometry\geometry.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", "image\image.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", "rendering\rendering.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
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSceneGraph", "scene_graph\scene_graph.vcproj", "{858093EF-6B95-4D0F-AA0A-CF187C6F369F}"
- ProjectSection(ProjectDependencies) = postProject
- {3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleStroke", "stroke\stroke.vcproj", "{DFCED64E-AEFA-4D06-8609-DE23A69D0361}"
- ProjectSection(ProjectDependencies) = postProject
- {FA76B552-8A89-4A50-92F7-A77935515005} = {FA76B552-8A89-4A50-92F7-A77935515005}
- {3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSystem", "system\system.vcproj", "{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleViewMap", "view_map\view_map.vcproj", "{FA76B552-8A89-4A50-92F7-A77935515005}"
- ProjectSection(ProjectDependencies) = postProject
- {AF37DD50-8CD3-4339-AB32-C6F8F770CB30} = {AF37DD50-8CD3-4339-AB32-C6F8F770CB30}
- {3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
- {4C44396A-8016-4360-8F5C-35CA6CC282BD} = {4C44396A-8016-4360-8F5C-35CA6CC282BD}
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleWingedEdge", "winged_edge\winged_edge.vcproj", "{AF37DD50-8CD3-4339-AB32-C6F8F770CB30}"
- ProjectSection(ProjectDependencies) = postProject
- {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
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Debug.ActiveCfg = Debug|Win32
- {0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Debug.Build.0 = Debug|Win32
- {0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Release.ActiveCfg = Release|Win32
- {0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Release.Build.0 = Release|Win32
- {3E1C0A57-8206-402F-A12E-3B100F121DDE}.Debug.ActiveCfg = Debug|Win32
- {3E1C0A57-8206-402F-A12E-3B100F121DDE}.Debug.Build.0 = Debug|Win32
- {3E1C0A57-8206-402F-A12E-3B100F121DDE}.Release.ActiveCfg = Release|Win32
- {3E1C0A57-8206-402F-A12E-3B100F121DDE}.Release.Build.0 = Release|Win32
- {4C44396A-8016-4360-8F5C-35CA6CC282BD}.Debug.ActiveCfg = Debug|Win32
- {4C44396A-8016-4360-8F5C-35CA6CC282BD}.Debug.Build.0 = Debug|Win32
- {4C44396A-8016-4360-8F5C-35CA6CC282BD}.Release.ActiveCfg = Release|Win32
- {4C44396A-8016-4360-8F5C-35CA6CC282BD}.Release.Build.0 = Release|Win32
- {9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Debug.ActiveCfg = Debug|Win32
- {9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Debug.Build.0 = Debug|Win32
- {9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Release.ActiveCfg = Release|Win32
- {9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Release.Build.0 = Release|Win32
- {858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Debug.ActiveCfg = Debug|Win32
- {858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Debug.Build.0 = Debug|Win32
- {858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Release.ActiveCfg = Release|Win32
- {858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Release.Build.0 = Release|Win32
- {DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Debug.ActiveCfg = Debug|Win32
- {DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Debug.Build.0 = Debug|Win32
- {DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Release.ActiveCfg = Release|Win32
- {DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Release.Build.0 = Release|Win32
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Debug.ActiveCfg = Debug|Win32
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Debug.Build.0 = Debug|Win32
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Release.ActiveCfg = Release|Win32
- {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Release.Build.0 = Release|Win32
- {FA76B552-8A89-4A50-92F7-A77935515005}.Debug.ActiveCfg = Debug|Win32
- {FA76B552-8A89-4A50-92F7-A77935515005}.Debug.Build.0 = Debug|Win32
- {FA76B552-8A89-4A50-92F7-A77935515005}.Release.ActiveCfg = Release|Win32
- {FA76B552-8A89-4A50-92F7-A77935515005}.Release.Build.0 = Release|Win32
- {AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Debug.ActiveCfg = Debug|Win32
- {AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Debug.Build.0 = Debug|Win32
- {AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Release.ActiveCfg = Release|Win32
- {AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
diff --git a/source/blender/freestyle/misc/Freestyle-vc8-debug.sln b/source/blender/freestyle/misc/Freestyle-vc8-debug.sln
deleted file mode 100755
index 097ca30a174..00000000000
--- a/source/blender/freestyle/misc/Freestyle-vc8-debug.sln
+++ /dev/null
@@ -1,87 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSystem_d", "system\system_d.vcproj", "{AAAAA9BB-8C01-3BC3-9808-AB6717F08393}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleGeometry_d", "geometry\geometry_d.vcproj", "{5F60164C-8544-3259-A8CB-24636A092489}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleImage_d", "image\image_d.vcproj", "{28F6AC11-2A9B-3886-97DD-82FB353409CB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSceneGraph_d", "scene_graph\scene_graph_d.vcproj", "{C98C60D8-9836-30A5-BEA9-0D320E5AF308}"
- ProjectSection(ProjectDependencies) = postProject
- {AAAAA9BB-8C01-3BC3-9808-AB6717F08393} = {AAAAA9BB-8C01-3BC3-9808-AB6717F08393}
- {5F60164C-8544-3259-A8CB-24636A092489} = {5F60164C-8544-3259-A8CB-24636A092489}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleWingedEdge_d", "winged_edge\winged_edge_d.vcproj", "{E46825D6-9581-3D8A-96FE-7C90BC188602}"
- ProjectSection(ProjectDependencies) = postProject
- {5F60164C-8544-3259-A8CB-24636A092489} = {5F60164C-8544-3259-A8CB-24636A092489}
- {AAAAA9BB-8C01-3BC3-9808-AB6717F08393} = {AAAAA9BB-8C01-3BC3-9808-AB6717F08393}
- {C98C60D8-9836-30A5-BEA9-0D320E5AF308} = {C98C60D8-9836-30A5-BEA9-0D320E5AF308}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleViewMap_d", "view_map\view_map_d.vcproj", "{6769BAB7-2894-3453-B07A-58C32D6646E3}"
- ProjectSection(ProjectDependencies) = postProject
- {C98C60D8-9836-30A5-BEA9-0D320E5AF308} = {C98C60D8-9836-30A5-BEA9-0D320E5AF308}
- {E46825D6-9581-3D8A-96FE-7C90BC188602} = {E46825D6-9581-3D8A-96FE-7C90BC188602}
- {AAAAA9BB-8C01-3BC3-9808-AB6717F08393} = {AAAAA9BB-8C01-3BC3-9808-AB6717F08393}
- {5F60164C-8544-3259-A8CB-24636A092489} = {5F60164C-8544-3259-A8CB-24636A092489}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleStroke_d", "stroke\stroke_d.vcproj", "{EDA5F096-B8D0-336F-82DB-501B2F00C1CD}"
- ProjectSection(ProjectDependencies) = postProject
- {5F60164C-8544-3259-A8CB-24636A092489} = {5F60164C-8544-3259-A8CB-24636A092489}
- {6769BAB7-2894-3453-B07A-58C32D6646E3} = {6769BAB7-2894-3453-B07A-58C32D6646E3}
- {AAAAA9BB-8C01-3BC3-9808-AB6717F08393} = {AAAAA9BB-8C01-3BC3-9808-AB6717F08393}
- {E46825D6-9581-3D8A-96FE-7C90BC188602} = {E46825D6-9581-3D8A-96FE-7C90BC188602}
- {C98C60D8-9836-30A5-BEA9-0D320E5AF308} = {C98C60D8-9836-30A5-BEA9-0D320E5AF308}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleRendering_d", "rendering\rendering_d.vcproj", "{D5EA771F-A1FF-3F68-A391-98EEEB407E78}"
- ProjectSection(ProjectDependencies) = postProject
- {5F60164C-8544-3259-A8CB-24636A092489} = {5F60164C-8544-3259-A8CB-24636A092489}
- {EDA5F096-B8D0-336F-82DB-501B2F00C1CD} = {EDA5F096-B8D0-336F-82DB-501B2F00C1CD}
- {AAAAA9BB-8C01-3BC3-9808-AB6717F08393} = {AAAAA9BB-8C01-3BC3-9808-AB6717F08393}
- {C98C60D8-9836-30A5-BEA9-0D320E5AF308} = {C98C60D8-9836-30A5-BEA9-0D320E5AF308}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Freestyle_d", "app\app_d.vcproj", "{606D6459-D5F6-3A09-8962-50E8551545AB}"
- ProjectSection(ProjectDependencies) = postProject
- {C98C60D8-9836-30A5-BEA9-0D320E5AF308} = {C98C60D8-9836-30A5-BEA9-0D320E5AF308}
- {E46825D6-9581-3D8A-96FE-7C90BC188602} = {E46825D6-9581-3D8A-96FE-7C90BC188602}
- {AAAAA9BB-8C01-3BC3-9808-AB6717F08393} = {AAAAA9BB-8C01-3BC3-9808-AB6717F08393}
- {6769BAB7-2894-3453-B07A-58C32D6646E3} = {6769BAB7-2894-3453-B07A-58C32D6646E3}
- {EDA5F096-B8D0-336F-82DB-501B2F00C1CD} = {EDA5F096-B8D0-336F-82DB-501B2F00C1CD}
- {5F60164C-8544-3259-A8CB-24636A092489} = {5F60164C-8544-3259-A8CB-24636A092489}
- {D5EA771F-A1FF-3F68-A391-98EEEB407E78} = {D5EA771F-A1FF-3F68-A391-98EEEB407E78}
- {28F6AC11-2A9B-3886-97DD-82FB353409CB} = {28F6AC11-2A9B-3886-97DD-82FB353409CB}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {AAAAA9BB-8C01-3BC3-9808-AB6717F08393}.Debug|Win32.ActiveCfg = Debug|Win32
- {AAAAA9BB-8C01-3BC3-9808-AB6717F08393}.Debug|Win32.Build.0 = Debug|Win32
- {5F60164C-8544-3259-A8CB-24636A092489}.Debug|Win32.ActiveCfg = Debug|Win32
- {5F60164C-8544-3259-A8CB-24636A092489}.Debug|Win32.Build.0 = Debug|Win32
- {28F6AC11-2A9B-3886-97DD-82FB353409CB}.Debug|Win32.ActiveCfg = Debug|Win32
- {28F6AC11-2A9B-3886-97DD-82FB353409CB}.Debug|Win32.Build.0 = Debug|Win32
- {C98C60D8-9836-30A5-BEA9-0D320E5AF308}.Debug|Win32.ActiveCfg = Debug|Win32
- {C98C60D8-9836-30A5-BEA9-0D320E5AF308}.Debug|Win32.Build.0 = Debug|Win32
- {E46825D6-9581-3D8A-96FE-7C90BC188602}.Debug|Win32.ActiveCfg = Debug|Win32
- {E46825D6-9581-3D8A-96FE-7C90BC188602}.Debug|Win32.Build.0 = Debug|Win32
- {6769BAB7-2894-3453-B07A-58C32D6646E3}.Debug|Win32.ActiveCfg = Debug|Win32
- {6769BAB7-2894-3453-B07A-58C32D6646E3}.Debug|Win32.Build.0 = Debug|Win32
- {EDA5F096-B8D0-336F-82DB-501B2F00C1CD}.Debug|Win32.ActiveCfg = Debug|Win32
- {EDA5F096-B8D0-336F-82DB-501B2F00C1CD}.Debug|Win32.Build.0 = Debug|Win32
- {D5EA771F-A1FF-3F68-A391-98EEEB407E78}.Debug|Win32.ActiveCfg = Debug|Win32
- {D5EA771F-A1FF-3F68-A391-98EEEB407E78}.Debug|Win32.Build.0 = Debug|Win32
- {606D6459-D5F6-3A09-8962-50E8551545AB}.Debug|Win32.ActiveCfg = Debug|Win32
- {606D6459-D5F6-3A09-8962-50E8551545AB}.Debug|Win32.Build.0 = Debug|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/source/blender/freestyle/misc/Freestyle-vc8-release.sln b/source/blender/freestyle/misc/Freestyle-vc8-release.sln
deleted file mode 100755
index 82b22ff0c3e..00000000000
--- a/source/blender/freestyle/misc/Freestyle-vc8-release.sln
+++ /dev/null
@@ -1,87 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Freestyle", "app\app.vcproj", "{B56F2464-158F-32C1-A9F7-EE85397706EC}"
- ProjectSection(ProjectDependencies) = postProject
- {555B73B2-B07B-3865-9D41-0FB69091E0C9} = {555B73B2-B07B-3865-9D41-0FB69091E0C9}
- {F6589FA0-9FA2-31F9-BD0F-FFE303DE8759} = {F6589FA0-9FA2-31F9-BD0F-FFE303DE8759}
- {9A93A87D-09E4-3492-A68C-A7B1A38DE002} = {9A93A87D-09E4-3492-A68C-A7B1A38DE002}
- {3804962B-1D5B-382E-B69E-96FFB2372A46} = {3804962B-1D5B-382E-B69E-96FFB2372A46}
- {A494B81F-F5EC-35DE-8DDC-4F6FD6B536D5} = {A494B81F-F5EC-35DE-8DDC-4F6FD6B536D5}
- {35891119-E049-35BB-AB8E-8536817F5CEE} = {35891119-E049-35BB-AB8E-8536817F5CEE}
- {0FDD8610-0785-3089-900D-53F786E9AC9B} = {0FDD8610-0785-3089-900D-53F786E9AC9B}
- {1D57A40D-AE4B-3E40-A023-4F37C9D7446C} = {1D57A40D-AE4B-3E40-A023-4F37C9D7446C}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleGeometry", "geometry\geometry.vcproj", "{1D57A40D-AE4B-3E40-A023-4F37C9D7446C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleImage", "image\image.vcproj", "{A494B81F-F5EC-35DE-8DDC-4F6FD6B536D5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleRendering", "rendering\rendering.vcproj", "{0FDD8610-0785-3089-900D-53F786E9AC9B}"
- ProjectSection(ProjectDependencies) = postProject
- {1D57A40D-AE4B-3E40-A023-4F37C9D7446C} = {1D57A40D-AE4B-3E40-A023-4F37C9D7446C}
- {35891119-E049-35BB-AB8E-8536817F5CEE} = {35891119-E049-35BB-AB8E-8536817F5CEE}
- {3804962B-1D5B-382E-B69E-96FFB2372A46} = {3804962B-1D5B-382E-B69E-96FFB2372A46}
- {9A93A87D-09E4-3492-A68C-A7B1A38DE002} = {9A93A87D-09E4-3492-A68C-A7B1A38DE002}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSceneGraph", "scene_graph\scene_graph.vcproj", "{35891119-E049-35BB-AB8E-8536817F5CEE}"
- ProjectSection(ProjectDependencies) = postProject
- {3804962B-1D5B-382E-B69E-96FFB2372A46} = {3804962B-1D5B-382E-B69E-96FFB2372A46}
- {1D57A40D-AE4B-3E40-A023-4F37C9D7446C} = {1D57A40D-AE4B-3E40-A023-4F37C9D7446C}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleStroke", "stroke\stroke.vcproj", "{9A93A87D-09E4-3492-A68C-A7B1A38DE002}"
- ProjectSection(ProjectDependencies) = postProject
- {1D57A40D-AE4B-3E40-A023-4F37C9D7446C} = {1D57A40D-AE4B-3E40-A023-4F37C9D7446C}
- {35891119-E049-35BB-AB8E-8536817F5CEE} = {35891119-E049-35BB-AB8E-8536817F5CEE}
- {3804962B-1D5B-382E-B69E-96FFB2372A46} = {3804962B-1D5B-382E-B69E-96FFB2372A46}
- {F6589FA0-9FA2-31F9-BD0F-FFE303DE8759} = {F6589FA0-9FA2-31F9-BD0F-FFE303DE8759}
- {555B73B2-B07B-3865-9D41-0FB69091E0C9} = {555B73B2-B07B-3865-9D41-0FB69091E0C9}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSystem", "system\system.vcproj", "{3804962B-1D5B-382E-B69E-96FFB2372A46}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleViewMap", "view_map\view_map.vcproj", "{F6589FA0-9FA2-31F9-BD0F-FFE303DE8759}"
- ProjectSection(ProjectDependencies) = postProject
- {555B73B2-B07B-3865-9D41-0FB69091E0C9} = {555B73B2-B07B-3865-9D41-0FB69091E0C9}
- {3804962B-1D5B-382E-B69E-96FFB2372A46} = {3804962B-1D5B-382E-B69E-96FFB2372A46}
- {35891119-E049-35BB-AB8E-8536817F5CEE} = {35891119-E049-35BB-AB8E-8536817F5CEE}
- {1D57A40D-AE4B-3E40-A023-4F37C9D7446C} = {1D57A40D-AE4B-3E40-A023-4F37C9D7446C}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleWingedEdge", "winged_edge\winged_edge.vcproj", "{555B73B2-B07B-3865-9D41-0FB69091E0C9}"
- ProjectSection(ProjectDependencies) = postProject
- {1D57A40D-AE4B-3E40-A023-4F37C9D7446C} = {1D57A40D-AE4B-3E40-A023-4F37C9D7446C}
- {35891119-E049-35BB-AB8E-8536817F5CEE} = {35891119-E049-35BB-AB8E-8536817F5CEE}
- {3804962B-1D5B-382E-B69E-96FFB2372A46} = {3804962B-1D5B-382E-B69E-96FFB2372A46}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B56F2464-158F-32C1-A9F7-EE85397706EC}.Release|Win32.ActiveCfg = Release|Win32
- {B56F2464-158F-32C1-A9F7-EE85397706EC}.Release|Win32.Build.0 = Release|Win32
- {1D57A40D-AE4B-3E40-A023-4F37C9D7446C}.Release|Win32.ActiveCfg = Release|Win32
- {1D57A40D-AE4B-3E40-A023-4F37C9D7446C}.Release|Win32.Build.0 = Release|Win32
- {A494B81F-F5EC-35DE-8DDC-4F6FD6B536D5}.Release|Win32.ActiveCfg = Release|Win32
- {A494B81F-F5EC-35DE-8DDC-4F6FD6B536D5}.Release|Win32.Build.0 = Release|Win32
- {0FDD8610-0785-3089-900D-53F786E9AC9B}.Release|Win32.ActiveCfg = Release|Win32
- {0FDD8610-0785-3089-900D-53F786E9AC9B}.Release|Win32.Build.0 = Release|Win32
- {35891119-E049-35BB-AB8E-8536817F5CEE}.Release|Win32.ActiveCfg = Release|Win32
- {35891119-E049-35BB-AB8E-8536817F5CEE}.Release|Win32.Build.0 = Release|Win32
- {9A93A87D-09E4-3492-A68C-A7B1A38DE002}.Release|Win32.ActiveCfg = Release|Win32
- {9A93A87D-09E4-3492-A68C-A7B1A38DE002}.Release|Win32.Build.0 = Release|Win32
- {3804962B-1D5B-382E-B69E-96FFB2372A46}.Release|Win32.ActiveCfg = Release|Win32
- {3804962B-1D5B-382E-B69E-96FFB2372A46}.Release|Win32.Build.0 = Release|Win32
- {F6589FA0-9FA2-31F9-BD0F-FFE303DE8759}.Release|Win32.ActiveCfg = Release|Win32
- {F6589FA0-9FA2-31F9-BD0F-FFE303DE8759}.Release|Win32.Build.0 = Release|Win32
- {555B73B2-B07B-3865-9D41-0FB69091E0C9}.Release|Win32.ActiveCfg = Release|Win32
- {555B73B2-B07B-3865-9D41-0FB69091E0C9}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/source/blender/freestyle/misc/Makefile.pro b/source/blender/freestyle/misc/Makefile.pro
deleted file mode 100755
index 0e64bb342c3..00000000000
--- a/source/blender/freestyle/misc/Makefile.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# W A R N I N G ! ! ! #
-# a u t h o r i z e d p e r s o n a l o n l y #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-TEMPLATE = subdirs
-SUBDIRS = system \
- image \
- geometry \
- scene_graph \
- winged_edge \
- view_map \
- stroke \
- rendering \
-# swig \
- app
-
-
diff --git a/source/blender/freestyle/misc/build_bundle.macosx.py b/source/blender/freestyle/misc/build_bundle.macosx.py
deleted file mode 100755
index e97153f269c..00000000000
--- a/source/blender/freestyle/misc/build_bundle.macosx.py
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/usr/bin/python
-
-import os,sys,string
-
-install_dependencies=["GLUT",\
- "QtCore", "QtGui", "QtXml", \
- "libQGLViewer", "FreestyleSystem", "FreestyleRendering",\
- "FreestyleImage","FreestyleGeometry", "FreestyleSceneGraph", "FreestyleWingedEdge",\
- "FreestyleViewMap", "FreestyleStroke"]
-
-if not("FREESTYLE_DIR" in os.environ):
- print "FREESTYLE_DIR must be set to your Freestyle directory"
- sys.exit()
-
-src_dir_path=os.environ['FREESTYLE_DIR']
-dest_dir_path=os.path.join(os.environ['FREESTYLE_DIR'], "freestyle.2.0.0-macosx-x86")
-bundle_name="Freestyle.app"
-bundle_path=os.path.join(dest_dir_path,bundle_name)
-frameworks_path=os.path.join(bundle_path,"Contents/Frameworks")
-exe_path=os.path.join(bundle_path, "Contents/MacOS")
-original_lib_path=os.path.join(src_dir_path,"build/macosx/release/lib")
-original_exe_path=os.path.join(src_dir_path,"build/macosx/release",bundle_name,"Contents/MacOS")
-
-
-
-# Builds a dictionary of dependencies for
-# a given binary
-# The table format is:
-# "dependency name" "dependency path"
-def buildDependenciesTable(binary_file, dep_table):
- cmd="otool -L %s" % binary_file
- #print cmd
- #otool_output = os.system(cmd)
- otool_output = os.popen(cmd).read().split('\n')
- for dep_text in otool_output:
- if (dep_text.count(":") == 0):
- dep = dep_text.split(' ')[0].lstrip()
- dep_base_name=os.path.basename(dep)
- dep_table[dep_base_name] = dep
-
-
-def fixPaths(dep_table):
- for k,v in dep_table.items():
- if(k.count("Freestyle")):
- dep_table[k] = os.path.join(src_dir_path, "build/macosx/release/lib",v)
- if(k.count("QGLViewer")):
- dep_table[k] = os.path.join("/usr/lib", v)
-
-def extractFrameworkBaseDir(framework_lib):
- parts=framework_lib.split("/")
- head="/"
- tail=""
- in_head=True
- for p in parts:
- if(in_head == True):
- head=os.path.join(head,p)
- else:
- tail=os.path.join(tail,p)
- if(p.count(".framework") != 0):
- in_head=False
- return (head,tail)
-
-def installDependencies(dep_table, install_dependencies, new_dep_table):
- for k,v in dep_table.items():
- for d in install_dependencies:
- if(k.count(d)!=0):
- framework_dir_path=v
- cp_option=""
- head=""
- tail=""
- if(v.count("framework")):
- (head,tail) = extractFrameworkBaseDir(v)
- framework_dir_path=head
- cp_option="-R"
- lib_name=os.path.split(framework_dir_path)[1]
- target=os.path.join(frameworks_path,lib_name)
- # update new table
- if(tail != ""):
- new_dep_table[k] = os.path.join("@executable_path/../Frameworks",lib_name,tail)
- else:
- new_dep_table[k] = os.path.join("@executable_path/../Frameworks",lib_name)
- if(os.path.exists(target) != True):
- cmd = "cp %s %s %s" % (cp_option, framework_dir_path,frameworks_path)
- print "Installing dependency:",lib_name
- os.system(cmd)
-
-def updatePathsToDependencies(binary_file, install_dependencies, dep_table, new_dep_table):
- # executable:
- f_dep_table={}
- buildDependenciesTable(binary_file,f_dep_table)
- for k,v in f_dep_table.items():
- # is k in install_dependencies?
- for ld in install_dependencies:
- if(k.count(ld) != 0):
- #print new_dep_table
- cmd="install_name_tool -change %s %s %s" % (v,new_dep_table[k], binary_file)
- os.system(cmd)
- # check
- cmd="otool -L %s" % binary_file
- os.system(cmd)
-
-def cleanDir(dir, to_delete):
- os.chdir(dir)
- #print os.getcwd()
- for d in os.listdir("."):
- #print d
- if(d == "Headers"):
- cmd="rm -rf Headers"
- to_delete.append(os.path.join(dir,d))
- #os.system(cmd)
- elif(d.count("debug") != 0):
- cmd="rm -rf %s"%(d)
- #print cmd
- to_delete.append(os.path.join(dir,d))
- #os.system(cmd)
- elif(os.path.isdir(d) == True):
- #print d
- cleanDir(os.path.join(dir,d), to_delete)
- #else:
- # print d
- os.chdir(os.path.join(dir,".."))
- #print os.getcwd()
-
-
-# build bundle structure
-if( os.path.exists(dest_dir_path) != True):
- print "Creating directory",dest_dir_path
- os.mkdir(dest_dir_path)
-
-if(os.path.exists(bundle_path) != True):
- print "Creating the bundle structure", bundle_path
- cmd = "cp -R %s %s" % (os.path.join(src_dir_path, "build/macosx/release/",bundle_name), bundle_path)
- os.system(cmd)
- os.mkdir(os.path.join(bundle_path,"Contents/Frameworks"))
-
-
-dep_table = {}
-new_dep_table = {}
-# Executable
-for f in os.listdir(original_exe_path):
- if(f[0] == '.'):
- continue
- exe_file_path=os.path.join(original_exe_path, f)
- buildDependenciesTable(exe_file_path, dep_table)
-
-# Frameworks
-for f in os.listdir(original_lib_path):
- if (f.count("framework") == 0):
- continue
- f_name=f.split('.')[0]
- fwk_path=os.path.join(original_lib_path, "%s.framework" % f_name,f_name)
- buildDependenciesTable(fwk_path, dep_table)
-
-# Fix ad-hoc paths
-fixPaths(dep_table)
-
-# install dependent libs
-installDependencies(dep_table, install_dependencies, new_dep_table)
-
-# update paths to installed dependencies
-for f in os.listdir(exe_path):
- if(f[0] == '.'):
- continue
- updatePathsToDependencies(os.path.join(exe_path,f), install_dependencies, dep_table, new_dep_table)
-
-# Frameworks
-for f in os.listdir(frameworks_path):
- if (f.count("framework") == 0):
- continue
- f_name=f.split('.')[0]
- fwk_path=os.path.join(frameworks_path, "%s.framework" % f_name,f_name)
- updatePathsToDependencies(fwk_path, install_dependencies, dep_table, new_dep_table)
-
-
-# Clean-up
-# Remove debug libs
-print "Cleaning..."
-to_delete=[]
-cleanDir(bundle_path, to_delete)
-for f in to_delete:
- cmd = "rm -rf %s"%f
- print cmd
- os.system(cmd)
diff --git a/source/blender/freestyle/misc/libconfig.pri b/source/blender/freestyle/misc/libconfig.pri
deleted file mode 100755
index 6fec8878694..00000000000
--- a/source/blender/freestyle/misc/libconfig.pri
+++ /dev/null
@@ -1,110 +0,0 @@
-# This file should be viewed as a -*- mode: Makefile -*-
-
-contains( CONFIG, 3ds1.20 ) {
- message ("Using 3ds 1.2.0 module")
- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE/LINUX
- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -l3ds
- cygwin-g++:INCLUDEPATH *= /usr/lib/lib3ds-1.2.0
- cygwin-g++:LIBS *= -L/usr/lib/lib3ds-1.2.0/lib3ds -l3ds
- mac:INCLUDEPATH *= /usr/local/include
- mac:LIBS *= -l3ds
- mac:QMAKE_LIBDIR *= /usr/local/lib
- win32: INCLUDEPATH *= C:\include\lib3ds\1.2.0
- win32: QMAKE_LIBDIR *= C:\lib\lib3ds\1.2.0
- win32:debug: LIBS *= lib3ds-120sd.lib
- win32:release: LIBS *= lib3ds-120s.lib
-}
-
-contains( CONFIG, 3ds1.30 ) {
- message ("Using 3ds 1.3.0 module")
- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE/LINUX
- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -l3ds
- cygwin-g++:INCLUDEPATH *= /usr/lib/lib3ds-1.3.0
- cygwin-g++:LIBS *= -L/usr/lib/lib3ds-1.3.0/lib3ds -l3ds
- mac:INCLUDEPATH *= /usr/local/include
- mac:LIBS *= -l3ds
- mac:QMAKE_LIBDIR *= /usr/local/lib
- win32: INCLUDEPATH *= C:\include\lib3ds\1.3.0
- win32: QMAKE_LIBDIR *= C:\lib\lib3ds\1.3.0
- win32:debug: LIBS *= lib3ds-1_3d.lib
- win32:release: LIBS *= lib3ds-1_3.lib
-}
-
-contains( CONFIG, qglviewer ) {
- message ("Using QGLViewer module")
- CONFIG *= qt thread opengl glut
- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE
- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -lQGLViewer
- cygwin-g++:LIBS *= -lQGLViewer
- win32: INCLUDEPATH *= $(HOME)\INCLUDE
- win32: QMAKE_LIBDIR *= $(HOME)\LIB
- win32: LIBS *= QGLViewer.lib
-}
-
-contains( CONFIG, python2.3) {
- message ("Using python 2.3 module")
- linux-g++:INCLUDEPATH *= /usr/include/python2.3
- linux-g++:LIBS *= -lpthread -lm -lutil
- linux-g++:LIBS *= -L/usr/local/lib/ -lpython2.3 -L$(HOME)/LIB/LINUX
- win32: INCLUDEPATH *= C:\python23\include
- win32: QMAKE_LIBDIR *= C:\python23\libs
- win32: LIBS *= python23.lib
-}
-
-contains( CONFIG, python2.4) {
- message ("Using python 2.4 module")
- linux-g++:INCLUDEPATH *= /usr/include/python2.4
- linux-g++:LIBS *= -lpthread -lm -lutil
- linux-g++:LIBS *= -L/usr/local/lib/ -lpython2.4 -L$(HOME)/LIB/LINUX
- cygwin-g++:INCLUDEPATH *= /usr/include/python2.4
- cygwin-g++:LIBS *= -lpthread -lm -lutil
- cygwin-g++:LIBS *= -L/usr/lib/python2.4/config -lpython2.4
- win32: INCLUDEPATH *= C:\python24\include
- win32: QMAKE_LIBDIR *= C:\python24\libs
- win32: LIBS *= python24.lib
-}
-
-contains( CONFIG, python2.5) {
- message ("Using python 2.5 module")
- linux-g++:INCLUDEPATH *= /usr/include/python2.5
- linux-g++:LIBS *= -lpthread -lm -lutil
- linux-g++:LIBS *= -L/usr/local/lib/ -lpython2.5 -L$(HOME)/LIB/LINUX
- mac: INCLUDEPATH *= /usr/include/python2.5
- mac: LIBS *= -L/usr/lib/python2.5/config -lpython2.5
- cygwin-g++:INCLUDEPATH *= /usr/include/python2.5
- cygwin-g++:LIBS *= -lpthread -lm -lutil
- cygwin-g++:LIBS *= -L/usr/lib/python2.5/config -lpython2.5
- win32: INCLUDEPATH *= C:\python25\include
- win32: QMAKE_LIBDIR *= C:\python25\libs
- win32: LIBS *= python25.lib
-}
-
-
-contains( CONFIG, glut) {
- message ("Using glut module")
- linux-g++:LIBS *= -lglut -lXi
- cygwin-g++:LIBS *= -lglut -lXi
- mac: LIBS *= -framework Glut
- win32:INCLUDEPATH *= C:\include
- win32: QMAKE_LIBDIR *= C:\lib\glut
- win32: LIBS *= glut32.lib
-}
-
-contains( CONFIG, qglviewer2 ) {
- message ("Using QGLViewer module")
- CONFIG *= qt thread opengl glut
- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE
- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -lQGLViewer
- mac: LIBS *= -lQGLViewer
- cygwin-g++:LIBS *= -lQGLViewer2
- win32: INCLUDEPATH *= C:\include\QGLViewer\2.2.5
- win32{
- release{
- QMAKE_LIBDIR *= C:\lib\QGLViewer\release
- }
- debug{
- QMAKE_LIBDIR *= C:\lib\QGLViewer\debug
- }
- }
- win32: LIBS *= QGLViewer2.lib
-}
diff --git a/source/blender/freestyle/misc/makedsp.vcnet.debug.bat b/source/blender/freestyle/misc/makedsp.vcnet.debug.bat
deleted file mode 100755
index e19ca52b4f7..00000000000
--- a/source/blender/freestyle/misc/makedsp.vcnet.debug.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-@echo off
-for /D %%d in (*) do call :FOR2 %%d
-rem cd ..
-goto :EOF
-
-:FOR2
-set componentpath=%1
-set dirname=%~n1
-for %%p in (%componentpath%\*.pro) do if exist %%p call :DSP %%p
-
-goto :EOF
-
-:DSP
-set drive=%~d1
-set filepath=%~p1
-cd %drive%%filepath%
-rem echo %drive%%filepath%
-set filename=%~n1
-echo creating %filename%_d.vcproj from %filename%.pro ...
-if %filename% == app (
- qmake -t vcapp -win32 -o %filename%_d %filename%.pro
-) else (
- qmake -t vclib -win32 -o %filename%_d %filename%.pro
-)
-cd..
diff --git a/source/blender/freestyle/misc/makedsp.vcnet.release.bat b/source/blender/freestyle/misc/makedsp.vcnet.release.bat
deleted file mode 100755
index 3050a2fe4ea..00000000000
--- a/source/blender/freestyle/misc/makedsp.vcnet.release.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-@echo off
-for /D %%d in (*) do call :FOR2 %%d
-rem cd ..
-goto :EOF
-
-:FOR2
-set componentpath=%1
-set dirname=%~n1
-for %%p in (%componentpath%\*.pro) do if exist %%p call :DSP %%p
-
-goto :EOF
-
-:DSP
-set drive=%~d1
-set filepath=%~p1
-cd %drive%%filepath%
-rem echo %drive%%filepath%
-set filename=%~n1
-echo creating %filename%.vcproj from %filename%.pro ...
-if %filename% == app (
- qmake -t vcapp -win32 -o %filename% %filename%.pro
-) else (
- qmake -t vclib -win32 -o %filename% %filename%.pro
-)
-cd..