From cc80111b2bb9ccf62064979ae527cb2da10e4c31 Mon Sep 17 00:00:00 2001
From: Andrea Weikert <elubie@gmx.net>
Date: Sat, 20 Dec 2008 12:43:53 +0000
Subject: 2.5 * fix lost declaration and missing includes after blenlib
 cleanup. * bump warning level to W3 for Debug in a few libraries for MSVC9
 projectfiles. Others will follow.

---
 projectfiles_vc9/blender/avi/BL_avi.vcproj                | 3 ++-
 projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj | 2 +-
 projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj       | 2 +-
 projectfiles_vc9/blender/editors/ED_editors.vcproj        | 4 ----
 projectfiles_vc9/blender/gpu/BL_gpu.vcproj                | 2 +-
 projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj            | 3 ++-
 projectfiles_vc9/blender/loader/BLO_loader.vcproj         | 2 +-
 projectfiles_vc9/blender/nodes/nodes.vcproj               | 2 +-
 source/blender/blenlib/BLI_util.h                         | 3 +++
 source/blender/blenlib/intern/string.c                    | 3 +++
 10 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/projectfiles_vc9/blender/avi/BL_avi.vcproj b/projectfiles_vc9/blender/avi/BL_avi.vcproj
index e92139fa61a..f9700ab85c2 100644
--- a/projectfiles_vc9/blender/avi/BL_avi.vcproj
+++ b/projectfiles_vc9/blender/avi/BL_avi.vcproj
@@ -4,6 +4,7 @@
 	Version="9,00"
 	Name="BL_avi"
 	ProjectGUID="{9A307EE5-CD77-47BC-BD87-62508C7E19D8}"
+	RootNamespace="BL_avi"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -127,7 +128,7 @@
 				AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\avi\debug\"
 				ObjectFile="..\..\..\..\build\msvc_9\source\blender\avi\debug\"
 				ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\avi\debug\"
-				WarningLevel="2"
+				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 				CompileAs="0"
diff --git a/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
index 5805ae2d485..1c08a204389 100644
--- a/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
+++ b/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
@@ -128,7 +128,7 @@
 				AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\blenkernel\debug\"
 				ObjectFile="..\..\..\..\build\msvc_9\source\blender\blenkernel\debug\"
 				ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\blenkernel\debug\"
-				WarningLevel="2"
+				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 				CompileAs="0"
diff --git a/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj b/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
index 08707818b3a..0beed24e793 100644
--- a/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
+++ b/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
@@ -130,7 +130,7 @@
 				AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\"
 				ObjectFile="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\"
 				ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\blenlib\debug\"
-				WarningLevel="2"
+				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 				CompileAs="0"
diff --git a/projectfiles_vc9/blender/editors/ED_editors.vcproj b/projectfiles_vc9/blender/editors/ED_editors.vcproj
index 962f6f6a29d..ac7e560fc19 100644
--- a/projectfiles_vc9/blender/editors/ED_editors.vcproj
+++ b/projectfiles_vc9/blender/editors/ED_editors.vcproj
@@ -438,10 +438,6 @@
 		<Filter
 			Name="util"
 			>
-			<File
-				RelativePath="..\..\..\source\blender\editors\util\ed_markers.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\editors\util\ed_util.c"
 				>
diff --git a/projectfiles_vc9/blender/gpu/BL_gpu.vcproj b/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
index 82b6f30aa86..eb404e27f24 100644
--- a/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
+++ b/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
@@ -128,7 +128,7 @@
 				AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\gpu\debug\"
 				ObjectFile="..\..\..\..\build\msvc_9\source\blender\gpu\debug\"
 				ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\gpu\debug\"
-				WarningLevel="2"
+				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 				CompileAs="0"
diff --git a/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj b/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
index 703a6407f9a..90d0bd70d7a 100644
--- a/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
+++ b/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
@@ -4,6 +4,7 @@
 	Version="9,00"
 	Name="BL_imbuf"
 	ProjectGUID="{415BFD6E-64CF-422B-AF88-C07F040A7292}"
+	RootNamespace="BL_imbuf"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -52,7 +53,7 @@
 				AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\imbuf\debug\"
 				ObjectFile="..\..\..\..\build\msvc_9\source\blender\imbuf\debug\"
 				ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\imbuf\debug\"
-				WarningLevel="2"
+				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 				CompileAs="0"
diff --git a/projectfiles_vc9/blender/loader/BLO_loader.vcproj b/projectfiles_vc9/blender/loader/BLO_loader.vcproj
index 23a5ec53f47..24982654afd 100644
--- a/projectfiles_vc9/blender/loader/BLO_loader.vcproj
+++ b/projectfiles_vc9/blender/loader/BLO_loader.vcproj
@@ -53,7 +53,7 @@
 				AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\loader\debug\"
 				ObjectFile="..\..\..\..\build\msvc_9\source\blender\loader\debug\"
 				ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\loader\debug\"
-				WarningLevel="2"
+				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 				CompileAs="0"
diff --git a/projectfiles_vc9/blender/nodes/nodes.vcproj b/projectfiles_vc9/blender/nodes/nodes.vcproj
index b5f60bedc31..322b8e609d0 100644
--- a/projectfiles_vc9/blender/nodes/nodes.vcproj
+++ b/projectfiles_vc9/blender/nodes/nodes.vcproj
@@ -193,7 +193,7 @@
 				AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\nodes\debug\"
 				ObjectFile="..\..\..\..\build\msvc_9\source\blender\nodes\debug\"
 				ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\nodes\debug\"
-				WarningLevel="2"
+				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="0"
diff --git a/source/blender/blenlib/BLI_util.h b/source/blender/blenlib/BLI_util.h
index ca6dde8b3bd..e78a58b2282 100644
--- a/source/blender/blenlib/BLI_util.h
+++ b/source/blender/blenlib/BLI_util.h
@@ -55,6 +55,9 @@ int BLI_stringdec(char *string, char *kop, char *start, unsigned short *numlen);
 void BLI_stringenc(char *string, char *kop, char *start, unsigned short numlen, int pic);
 void BLI_splitdirstring(char *di,char *fi);
 
+/* make sure path separators conform to system one */
+void BLI_clean(char *path);
+
 /**
 	 * dir can be any input, like from buttons, and this function
 	 * converts it to a regular full path.
diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c
index 2fefe1d9b45..715a9316657 100644
--- a/source/blender/blenlib/intern/string.c
+++ b/source/blender/blenlib/intern/string.c
@@ -36,9 +36,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <ctype.h>
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_string.h"
+
 char *BLI_strdupn(const char *str, int len) {
 	char *n= MEM_mallocN(len+1, "strdup");
 	memcpy(n, str, len);
-- 
cgit v1.2.3