19 files changed, 210 insertions, 202 deletions
diff --git a/intern/make/msvc_7_0/intern.sln b/intern/make/msvc_7_0/intern.sln
index bdeb90481c8..ebc6d910c1f 100644
--- a/intern/make/msvc_7_0/intern.sln
+++ b/intern/make/msvc_7_0/intern.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build_install_all", "build_install_all.vcproj", "{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build_install_all", "build_install_all.vcproj", "{02110D03-59DB-4571-8787-72B3C03B2F2D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MoTo", "..\..\moto\make\msvc_7_0\MoTo.vcproj", "{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}"
 EndProject
@@ -33,103 +33,142 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opennl", "..\..\opennl\make
 EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
-		ConfigName.0 = Debug
-		ConfigName.1 = Release
+		ConfigName.0 = 3DPlugin Debug
+		ConfigName.1 = 3DPlugin Release
+		ConfigName.2 = Blender Debug
+		ConfigName.3 = Blender Release
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
-		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.0 = {51A348C1-8684-4D67-B980-97B1FC74159B}
-		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.1 = {E86B7BDE-C33C-4E55-9433-E74C141D7538}
-		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.2 = {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.0 = {76D90B92-ECC7-409C-9F98-A8814B90F3C0}
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.1 = {6B3229F4-2A37-47EE-8B89-9AA046B35193}
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.2 = {542A9FA1-B7FF-441C-AE15-054DB31D3488}
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.3 = {E86B7BDE-C33C-4E55-9433-E74C141D7538}
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.4 = {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.5 = {B789C2F3-279E-4A85-8F0A-7F7AC068E598}
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.6 = {E784098D-3ED8-433A-9353-9679415DDDC5}
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.7 = {121EC196-8E8A-4937-B0BD-0F114C87D55E}
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.8 = {FAF46346-65CC-4DB2-85C4-B99826F79D0C}
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.9 = {213356A9-3A1F-41DA-9819-1297BCD17DEE}
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.10 = {98330220-47A6-42E0-9DE4-AD0FF5D204D6}
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.11 = {51A348C1-8684-4D67-B980-97B1FC74159B}
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.12 = {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.13 = {8B8D4FC3-3234-4E54-8376-5AB83D00D164}
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.14 = {C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}
-		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.0 = {E86B7BDE-C33C-4E55-9433-E74C141D7538}
-		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.1 = {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}
-		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.2 = {51A348C1-8684-4D67-B980-97B1FC74159B}
-		{76D90B92-ECC7-409C-9F98-A8814B90F3C0}.0 = {B789C2F3-279E-4A85-8F0A-7F7AC068E598}
-		{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.0 = {B789C2F3-279E-4A85-8F0A-7F7AC068E598}
-		{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.1 = {6B3229F4-2A37-47EE-8B89-9AA046B35193}
-		{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.2 = {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}
-		{213356A9-3A1F-41DA-9819-1297BCD17DEE}.0 = {98330220-47A6-42E0-9DE4-AD0FF5D204D6}
-		{FAF46346-65CC-4DB2-85C4-B99826F79D0C}.0 = {98330220-47A6-42E0-9DE4-AD0FF5D204D6}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Debug.ActiveCfg = Debug|Win32
-		{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Debug.Build.0 = Debug|Win32
-		{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Release.ActiveCfg = Release|Win32
-		{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Release.Build.0 = Release|Win32
-		{121EC196-8E8A-4937-B0BD-0F114C87D55E}.Debug.ActiveCfg = Debug|Win32
-		{121EC196-8E8A-4937-B0BD-0F114C87D55E}.Debug.Build.0 = Debug|Win32
-		{121EC196-8E8A-4937-B0BD-0F114C87D55E}.Release.ActiveCfg = Release|Win32
-		{121EC196-8E8A-4937-B0BD-0F114C87D55E}.Release.Build.0 = Release|Win32
-		{E784098D-3ED8-433A-9353-9679415DDDC5}.Debug.ActiveCfg = Debug|Win32
-		{E784098D-3ED8-433A-9353-9679415DDDC5}.Debug.Build.0 = Debug|Win32
-		{E784098D-3ED8-433A-9353-9679415DDDC5}.Release.ActiveCfg = Release|Win32
-		{E784098D-3ED8-433A-9353-9679415DDDC5}.Release.Build.0 = Release|Win32
-		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Debug.ActiveCfg = Debug|Win32
-		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Debug.Build.0 = Debug|Win32
-		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Release.ActiveCfg = Release|Win32
-		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Release.Build.0 = Release|Win32
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.Debug.ActiveCfg = Debug|Win32
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.Debug.Build.0 = Debug|Win32
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.Release.ActiveCfg = Release|Win32
-		{3E2D09B4-8139-4B91-AA3F-BD1CC0D30681}.Release.Build.0 = Release|Win32
-		{51A348C1-8684-4D67-B980-97B1FC74159B}.Debug.ActiveCfg = Debug|Win32
-		{51A348C1-8684-4D67-B980-97B1FC74159B}.Debug.Build.0 = Debug|Win32
-		{51A348C1-8684-4D67-B980-97B1FC74159B}.Release.ActiveCfg = Release|Win32
-		{51A348C1-8684-4D67-B980-97B1FC74159B}.Release.Build.0 = Release|Win32
-		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.Debug.ActiveCfg = Debug|Win32
-		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.Debug.Build.0 = Debug|Win32
-		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.Release.ActiveCfg = Release|Win32
-		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.Release.Build.0 = Release|Win32
-		{76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Debug.ActiveCfg = Debug|Win32
-		{76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Debug.Build.0 = Debug|Win32
-		{76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Release.ActiveCfg = Release|Win32
-		{76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Release.Build.0 = Release|Win32
-		{6B3229F4-2A37-47EE-8B89-9AA046B35193}.Debug.ActiveCfg = Debug|Win32
-		{6B3229F4-2A37-47EE-8B89-9AA046B35193}.Debug.Build.0 = Debug|Win32
-		{6B3229F4-2A37-47EE-8B89-9AA046B35193}.Release.ActiveCfg = Release|Win32
-		{6B3229F4-2A37-47EE-8B89-9AA046B35193}.Release.Build.0 = Release|Win32
-		{542A9FA1-B7FF-441C-AE15-054DB31D3488}.Debug.ActiveCfg = Debug|Win32
-		{542A9FA1-B7FF-441C-AE15-054DB31D3488}.Debug.Build.0 = Debug|Win32
-		{542A9FA1-B7FF-441C-AE15-054DB31D3488}.Release.ActiveCfg = Release|Win32
-		{542A9FA1-B7FF-441C-AE15-054DB31D3488}.Release.Build.0 = Release|Win32
-		{E86B7BDE-C33C-4E55-9433-E74C141D7538}.Debug.ActiveCfg = Debug|Win32
-		{E86B7BDE-C33C-4E55-9433-E74C141D7538}.Debug.Build.0 = Debug|Win32
-		{E86B7BDE-C33C-4E55-9433-E74C141D7538}.Release.ActiveCfg = Release|Win32
-		{E86B7BDE-C33C-4E55-9433-E74C141D7538}.Release.Build.0 = Release|Win32
-		{B789C2F3-279E-4A85-8F0A-7F7AC068E598}.Debug.ActiveCfg = Debug|Win32
-		{B789C2F3-279E-4A85-8F0A-7F7AC068E598}.Debug.Build.0 = Debug|Win32
-		{B789C2F3-279E-4A85-8F0A-7F7AC068E598}.Release.ActiveCfg = Release|Win32
-		{B789C2F3-279E-4A85-8F0A-7F7AC068E598}.Release.Build.0 = Release|Win32
-		{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.Debug.ActiveCfg = Debug|Win32
-		{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.Debug.Build.0 = Debug|Win32
-		{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.Release.ActiveCfg = Release|Win32
-		{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.Release.Build.0 = Release|Win32
-		{213356A9-3A1F-41DA-9819-1297BCD17DEE}.Debug.ActiveCfg = Debug|Win32
-		{213356A9-3A1F-41DA-9819-1297BCD17DEE}.Debug.Build.0 = Debug|Win32
-		{213356A9-3A1F-41DA-9819-1297BCD17DEE}.Release.ActiveCfg = Release|Win32
-		{213356A9-3A1F-41DA-9819-1297BCD17DEE}.Release.Build.0 = Release|Win32
-		{FAF46346-65CC-4DB2-85C4-B99826F79D0C}.Debug.ActiveCfg = Debug|Win32
-		{FAF46346-65CC-4DB2-85C4-B99826F79D0C}.Debug.Build.0 = Debug|Win32
-		{FAF46346-65CC-4DB2-85C4-B99826F79D0C}.Release.ActiveCfg = Release|Win32
-		{FAF46346-65CC-4DB2-85C4-B99826F79D0C}.Release.Build.0 = Release|Win32
-		{8B8D4FC3-3234-4E54-8376-5AB83D00D164}.Debug.ActiveCfg = Debug|Win32
-		{8B8D4FC3-3234-4E54-8376-5AB83D00D164}.Debug.Build.0 = Debug|Win32
-		{8B8D4FC3-3234-4E54-8376-5AB83D00D164}.Release.ActiveCfg = Release|Win32
-		{8B8D4FC3-3234-4E54-8376-5AB83D00D164}.Release.Build.0 = Release|Win32
+		{02110D03-59DB-4571-8787-72B3C03B2F2D}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{02110D03-59DB-4571-8787-72B3C03B2F2D}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{02110D03-59DB-4571-8787-72B3C03B2F2D}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{02110D03-59DB-4571-8787-72B3C03B2F2D}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{02110D03-59DB-4571-8787-72B3C03B2F2D}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{02110D03-59DB-4571-8787-72B3C03B2F2D}.Blender Debug.Build.0 = Blender Debug|Win32
+		{02110D03-59DB-4571-8787-72B3C03B2F2D}.Blender Release.ActiveCfg = Blender Release|Win32
+		{02110D03-59DB-4571-8787-72B3C03B2F2D}.Blender Release.Build.0 = Blender Release|Win32
+		{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Blender Debug.Build.0 = Blender Debug|Win32
+		{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Blender Release.ActiveCfg = Blender Release|Win32
+		{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Blender Release.Build.0 = Blender Release|Win32
+		{121EC196-8E8A-4937-B0BD-0F114C87D55E}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{121EC196-8E8A-4937-B0BD-0F114C87D55E}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{121EC196-8E8A-4937-B0BD-0F114C87D55E}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{121EC196-8E8A-4937-B0BD-0F114C87D55E}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{121EC196-8E8A-4937-B0BD-0F114C87D55E}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{121EC196-8E8A-4937-B0BD-0F114C87D55E}.Blender Debug.Build.0 = Blender Debug|Win32
+		{121EC196-8E8A-4937-B0BD-0F114C87D55E}.Blender Release.ActiveCfg = Blender Release|Win32
+		{121EC196-8E8A-4937-B0BD-0F114C87D55E}.Blender Release.Build.0 = Blender Release|Win32
+		{E784098D-3ED8-433A-9353-9679415DDDC5}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{E784098D-3ED8-433A-9353-9679415DDDC5}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{E784098D-3ED8-433A-9353-9679415DDDC5}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{E784098D-3ED8-433A-9353-9679415DDDC5}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{E784098D-3ED8-433A-9353-9679415DDDC5}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{E784098D-3ED8-433A-9353-9679415DDDC5}.Blender Debug.Build.0 = Blender Debug|Win32
+		{E784098D-3ED8-433A-9353-9679415DDDC5}.Blender Release.ActiveCfg = Blender Release|Win32
+		{E784098D-3ED8-433A-9353-9679415DDDC5}.Blender Release.Build.0 = Blender Release|Win32
+		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Blender Debug.Build.0 = Blender Debug|Win32
+		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Blender Release.ActiveCfg = Blender Release|Win32
+		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Blender Release.Build.0 = Blender Release|Win32
+		{51A348C1-8684-4D67-B980-97B1FC74159B}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{51A348C1-8684-4D67-B980-97B1FC74159B}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{51A348C1-8684-4D67-B980-97B1FC74159B}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{51A348C1-8684-4D67-B980-97B1FC74159B}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{51A348C1-8684-4D67-B980-97B1FC74159B}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{51A348C1-8684-4D67-B980-97B1FC74159B}.Blender Debug.Build.0 = Blender Debug|Win32
+		{51A348C1-8684-4D67-B980-97B1FC74159B}.Blender Release.ActiveCfg = Blender Release|Win32
+		{51A348C1-8684-4D67-B980-97B1FC74159B}.Blender Release.Build.0 = Blender Release|Win32
+		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.Blender Debug.Build.0 = Blender Debug|Win32
+		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.Blender Release.ActiveCfg = Blender Release|Win32
+		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.Blender Release.Build.0 = Blender Release|Win32
+		{76D90B92-ECC7-409C-9F98-A8814B90F3C0}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{76D90B92-ECC7-409C-9F98-A8814B90F3C0}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{76D90B92-ECC7-409C-9F98-A8814B90F3C0}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{76D90B92-ECC7-409C-9F98-A8814B90F3C0}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Blender Debug.Build.0 = Blender Debug|Win32
+		{76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Blender Release.ActiveCfg = Blender Release|Win32
+		{76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Blender Release.Build.0 = Blender Release|Win32
+		{6B3229F4-2A37-47EE-8B89-9AA046B35193}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{6B3229F4-2A37-47EE-8B89-9AA046B35193}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{6B3229F4-2A37-47EE-8B89-9AA046B35193}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{6B3229F4-2A37-47EE-8B89-9AA046B35193}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{6B3229F4-2A37-47EE-8B89-9AA046B35193}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{6B3229F4-2A37-47EE-8B89-9AA046B35193}.Blender Debug.Build.0 = Blender Debug|Win32
+		{6B3229F4-2A37-47EE-8B89-9AA046B35193}.Blender Release.ActiveCfg = Blender Release|Win32
+		{6B3229F4-2A37-47EE-8B89-9AA046B35193}.Blender Release.Build.0 = Blender Release|Win32
+		{542A9FA1-B7FF-441C-AE15-054DB31D3488}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{542A9FA1-B7FF-441C-AE15-054DB31D3488}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{542A9FA1-B7FF-441C-AE15-054DB31D3488}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{542A9FA1-B7FF-441C-AE15-054DB31D3488}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{542A9FA1-B7FF-441C-AE15-054DB31D3488}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{542A9FA1-B7FF-441C-AE15-054DB31D3488}.Blender Debug.Build.0 = Blender Debug|Win32
+		{542A9FA1-B7FF-441C-AE15-054DB31D3488}.Blender Release.ActiveCfg = Blender Release|Win32
+		{542A9FA1-B7FF-441C-AE15-054DB31D3488}.Blender Release.Build.0 = Blender Release|Win32
+		{E86B7BDE-C33C-4E55-9433-E74C141D7538}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{E86B7BDE-C33C-4E55-9433-E74C141D7538}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{E86B7BDE-C33C-4E55-9433-E74C141D7538}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{E86B7BDE-C33C-4E55-9433-E74C141D7538}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{E86B7BDE-C33C-4E55-9433-E74C141D7538}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{E86B7BDE-C33C-4E55-9433-E74C141D7538}.Blender Debug.Build.0 = Blender Debug|Win32
+		{E86B7BDE-C33C-4E55-9433-E74C141D7538}.Blender Release.ActiveCfg = Blender Release|Win32
+		{E86B7BDE-C33C-4E55-9433-E74C141D7538}.Blender Release.Build.0 = Blender Release|Win32
+		{B789C2F3-279E-4A85-8F0A-7F7AC068E598}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{B789C2F3-279E-4A85-8F0A-7F7AC068E598}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{B789C2F3-279E-4A85-8F0A-7F7AC068E598}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{B789C2F3-279E-4A85-8F0A-7F7AC068E598}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{B789C2F3-279E-4A85-8F0A-7F7AC068E598}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{B789C2F3-279E-4A85-8F0A-7F7AC068E598}.Blender Debug.Build.0 = Blender Debug|Win32
+		{B789C2F3-279E-4A85-8F0A-7F7AC068E598}.Blender Release.ActiveCfg = Blender Release|Win32
+		{B789C2F3-279E-4A85-8F0A-7F7AC068E598}.Blender Release.Build.0 = Blender Release|Win32
+		{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.Blender Debug.Build.0 = Blender Debug|Win32
+		{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.Blender Release.ActiveCfg = Blender Release|Win32
+		{98330220-47A6-42E0-9DE4-AD0FF5D204D6}.Blender Release.Build.0 = Blender Release|Win32
+		{213356A9-3A1F-41DA-9819-1297BCD17DEE}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{213356A9-3A1F-41DA-9819-1297BCD17DEE}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{213356A9-3A1F-41DA-9819-1297BCD17DEE}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{213356A9-3A1F-41DA-9819-1297BCD17DEE}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{213356A9-3A1F-41DA-9819-1297BCD17DEE}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{213356A9-3A1F-41DA-9819-1297BCD17DEE}.Blender Debug.Build.0 = Blender Debug|Win32
+		{213356A9-3A1F-41DA-9819-1297BCD17DEE}.Blender Release.ActiveCfg = Blender Release|Win32
+		{213356A9-3A1F-41DA-9819-1297BCD17DEE}.Blender Release.Build.0 = Blender Release|Win32
+		{FAF46346-65CC-4DB2-85C4-B99826F79D0C}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{FAF46346-65CC-4DB2-85C4-B99826F79D0C}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{FAF46346-65CC-4DB2-85C4-B99826F79D0C}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{FAF46346-65CC-4DB2-85C4-B99826F79D0C}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{FAF46346-65CC-4DB2-85C4-B99826F79D0C}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{FAF46346-65CC-4DB2-85C4-B99826F79D0C}.Blender Debug.Build.0 = Blender Debug|Win32
+		{FAF46346-65CC-4DB2-85C4-B99826F79D0C}.Blender Release.ActiveCfg = Blender Release|Win32
+		{FAF46346-65CC-4DB2-85C4-B99826F79D0C}.Blender Release.Build.0 = Blender Release|Win32
+		{8B8D4FC3-3234-4E54-8376-5AB83D00D164}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32
+		{8B8D4FC3-3234-4E54-8376-5AB83D00D164}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32
+		{8B8D4FC3-3234-4E54-8376-5AB83D00D164}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32
+		{8B8D4FC3-3234-4E54-8376-5AB83D00D164}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32
+		{8B8D4FC3-3234-4E54-8376-5AB83D00D164}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{8B8D4FC3-3234-4E54-8376-5AB83D00D164}.Blender Debug.Build.0 = Blender Debug|Win32
+		{8B8D4FC3-3234-4E54-8376-5AB83D00D164}.Blender Release.ActiveCfg = Blender Release|Win32
+		{8B8D4FC3-3234-4E54-8376-5AB83D00D164}.Blender Release.Build.0 = Blender Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index efd0606904e..27d87ce9117 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -706,7 +706,7 @@ static void sort_alpha_id(ListBase *lb, ID *id)
 		
 		idtest= lb->first;
 		while(idtest) {
-			if(strcasecmp(idtest->name, id->name)>0 || idtest->lib) {
+			if(BLI_strcasecmp(idtest->name, id->name)>0 || idtest->lib) {
 				BLI_insertlinkbefore(lb, idtest, id);
 				break;
 			}
diff --git a/source/blender/blenkernel/intern/property.c b/source/blender/blenkernel/intern/property.c
index 51cbcf1a628..a60c03c4840 100644
--- a/source/blender/blenkernel/intern/property.c
+++ b/source/blender/blenkernel/intern/property.c
@@ -164,11 +164,11 @@ int compare_property(bProperty *prop, char *str)
 	
 	switch(prop->type) {
 	case PROP_BOOL:
-		if(strcasecmp(str, "true")==0) {
+		if(BLI_strcasecmp(str, "true")==0) {
 			if(prop->data==1) return 0;
 			else return 1;
 		}
-		else if(strcasecmp(str, "false")==0) {
+		else if(BLI_strcasecmp(str, "false")==0) {
 			if(prop->data==0) return 0;
 			else return 1;
 		}
@@ -200,8 +200,8 @@ void set_property(bProperty *prop, char *str)
 
 	switch(prop->type) {
 	case PROP_BOOL:
-		if(strcasecmp(str, "true")==0) prop->data= 1;
-		else if(strcasecmp(str, "false")==0) prop->data= 0;
+		if(BLI_strcasecmp(str, "true")==0) prop->data= 1;
+		else if(BLI_strcasecmp(str, "false")==0) prop->data= 0;
 		else prop->data= (atoi(str)!=0);
 		break;
 	case PROP_INT:
diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c
index 097e6107af2..77c35cc46ab 100644
--- a/source/blender/blenkernel/intern/writeavi.c
+++ b/source/blender/blenkernel/intern/writeavi.c
@@ -70,7 +70,7 @@ void makeavistring (char *string)
 
 	RE_make_existing_file(string);
 
-	if (strcasecmp(string + strlen(string) - 4, ".avi")) {
+	if (BLI_strcasecmp(string + strlen(string) - 4, ".avi")) {
 		sprintf(txt, "%04d_%04d.avi", (G.scene->r.sfra) , (G.scene->r.efra) );
 		strcat(string, txt);
 	}
diff --git a/source/blender/blenlib/BLI_blenlib.h b/source/blender/blenlib/BLI_blenlib.h
index 2e2dda5ef95..d133038b044 100644
--- a/source/blender/blenlib/BLI_blenlib.h
+++ b/source/blender/blenlib/BLI_blenlib.h
@@ -328,6 +328,9 @@ void BLI_setScanFillObjectRef(void* ob);
  */
 void BLI_setScanFillColourRef(char* c);
 
+int BLI_strcasecmp(const char *s1, const char *s2);
+int BLI_strncasecmp(const char *s1, const char *s2, int n);
+
 #define PRNTSUB(type,arg)			printf(#arg ": %" #type " ", arg)
 
 #ifndef PRINT
diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h
index d353c016751..1783443ea3b 100644
--- a/source/blender/blenlib/BLI_winstuff.h
+++ b/source/blender/blenlib/BLI_winstuff.h
@@ -110,10 +110,6 @@ typedef struct _DIR {
 } DIR;
 
 void RegisterBlendExtension(char * str);
-#ifndef FREE_WINDOWS
-int strcasecmp (char *s1, char *s2);
-int strncasecmp (char *s1, char *s2, int n);
-#endif
 DIR *opendir (const char *path);
 struct dirent *readdir(DIR *dp);
 int closedir (DIR *dp);
diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
index 50ac321d353..2b91542855f 100644
--- a/source/blender/blenlib/intern/storage.c
+++ b/source/blender/blenlib/intern/storage.c
@@ -152,7 +152,7 @@ int BLI_compare(struct direntry *entry1, struct direntry *entry2)
 	if( strcmp(entry2->relname, ".")==0 ) return (1);
 	if( strcmp(entry1->relname, "..")==0 ) return (-1);
 	
-	return (strcasecmp(entry1->relname,entry2->relname));
+	return (BLI_strcasecmp(entry1->relname,entry2->relname));
 }
 
 
diff --git a/source/blender/blenlib/intern/util.c b/source/blender/blenlib/intern/util.c
index 191309dac3e..859d8d007b8 100644
--- a/source/blender/blenlib/intern/util.c
+++ b/source/blender/blenlib/intern/util.c
@@ -107,23 +107,23 @@ int BLI_stringdec(char *string, char *kop, char *staart, unsigned short *numlen)
 	len2 = len =  strlen( string);
 	
 	if (len > 6) {
-		if (strncasecmp(string + len - 6, ".blend", 6) == 0) len -= 6;
-		else if (strncasecmp(string + len - 6, ".trace", 6) == 0) len -= 6;
+		if (BLI_strncasecmp(string + len - 6, ".blend", 6) == 0) len -= 6;
+		else if (BLI_strncasecmp(string + len - 6, ".trace", 6) == 0) len -= 6;
 	}
 	
 	if (len == len2) {
 		if (len > 4) {
 			/* handle .jf0 en .jf1 for jstreams */
-			if (strncasecmp(string + len - 4, ".jf", 3) == 0) len -= 4;
-			else if (strncasecmp(string + len - 4, ".tga", 4) == 0) len -= 4;
-			else if (strncasecmp(string + len - 4, ".jpg", 4) == 0) len -= 4;
-			else if (strncasecmp(string + len - 4, ".png", 4) == 0) len -= 4;
-			else if (strncasecmp(string + len - 4, ".txt", 4) == 0) len -= 4;
-			else if (strncasecmp(string + len - 4, ".cyc", 4) == 0) len -= 4;
-			else if (strncasecmp(string + len - 4, ".enh", 4) == 0) len -= 4;
-			else if (strncasecmp(string + len - 4, ".rgb", 4) == 0) len -= 4;
-			else if (strncasecmp(string + len - 4, ".psx", 4) == 0) len -= 4;
-			else if (strncasecmp(string + len - 4, ".ble", 4) == 0) len -= 4;
+			if (BLI_strncasecmp(string + len - 4, ".jf", 3) == 0) len -= 4;
+			else if (BLI_strncasecmp(string + len - 4, ".tga", 4) == 0) len -= 4;
+			else if (BLI_strncasecmp(string + len - 4, ".jpg", 4) == 0) len -= 4;
+			else if (BLI_strncasecmp(string + len - 4, ".png", 4) == 0) len -= 4;
+			else if (BLI_strncasecmp(string + len - 4, ".txt", 4) == 0) len -= 4;
+			else if (BLI_strncasecmp(string + len - 4, ".cyc", 4) == 0) len -= 4;
+			else if (BLI_strncasecmp(string + len - 4, ".enh", 4) == 0) len -= 4;
+			else if (BLI_strncasecmp(string + len - 4, ".rgb", 4) == 0) len -= 4;
+			else if (BLI_strncasecmp(string + len - 4, ".psx", 4) == 0) len -= 4;
+			else if (BLI_strncasecmp(string + len - 4, ".ble", 4) == 0) len -= 4;
 		}
 	}
 	
@@ -413,7 +413,7 @@ int BLI_streq(char *a, char *b) {
 	return (strcmp(a, b)==0);
 }
 int BLI_strcaseeq(char *a, char *b) {
-	return (strcasecmp(a, b)==0);
+	return (BLI_strcasecmp(a, b)==0);
 }
 
 void BLI_makestringcode(char *fromfile, char *str)
@@ -641,7 +641,7 @@ int BLI_testextensie(char *str, char *ext)
 
 	if(a==0 || b==0 || b>=a) {
 		retval = 0;
-	} else if (strcasecmp(ext, str + a - b)) {
+	} else if (BLI_strcasecmp(ext, str + a - b)) {
 		retval = 0;	
 	} else {
 		retval = 1;
@@ -894,3 +894,40 @@ char* BLI_getbundle(void) {
 }
 #endif
 
+int BLI_strcasecmp(const char *s1, const char *s2) {
+	int i;
+
+	for (i=0; ; i++) {
+		char c1 = tolower(s1[i]);
+		char c2 = tolower(s2[i]);
+
+		if (c1<c2) {
+			return -1;
+		} else if (c1>c2) {
+			return 1;
+		} else if (c1==0) {
+			break;
+		}
+	}
+
+	return 0;
+}
+
+int BLI_strncasecmp(const char *s1, const char *s2, int n) {
+	int i;
+
+	for (i=0; i<n; i++) {
+		char c1 = tolower(s1[i]);
+		char c2 = tolower(s2[i]);
+
+		if (c1<c2) {
+			return -1;
+		} else if (c1>c2) {
+			return 1;
+		} else if (c1==0) {
+			break;
+		}
+	}
+
+	return 0;
+}
diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c
index 960bc69d797..34b9d9cf9b9 100644
--- a/source/blender/blenlib/intern/winstuff.c
+++ b/source/blender/blenlib/intern/winstuff.c
@@ -99,64 +99,6 @@ void RegisterBlendExtension(char * str) {
 	}
 }
 
-static void strlower (char *str) {
-	while (*str) {
-		*str= tolower(*str);
-		str++;
-	}
-}
-
-static void strnlower (char *str, int n) {
-	while (n>0 && *str) {
-		*str= tolower(*str);
-		str++;
-		n--;
-	}
-}
-
-#ifndef FREE_WINDOWS
-int strcasecmp (char *s1, char *s2) {
-	char *st1, *st2;
-	int r;
-	
-	st1= MEM_mallocN(strlen(s1)+1, "temp string");
-	strcpy(st1, s1);
-
-	st2= MEM_mallocN(strlen(s2)+1, "temp string");
-	strcpy(st2, s2);
-
-	strlower(st1);
-	strlower(st2);
-	r= strcmp (st1, st2);
-	
-	MEM_freeN(st1);
-	MEM_freeN(st2);
-
-	return r;
-}
-
-int strncasecmp (char *s1, char *s2, int n) {
-	char *st1, *st2;
-	int r;
-	
-	st1= MEM_mallocN(n, "temp string");
-	memcpy(st1, s1, n);
-
-	st2= MEM_mallocN(n, "temp string");
-	memcpy(st2, s2, n);
-
-	strnlower(st1, n);
-	strnlower(st2, n);
-
-	r= strncmp (st1, st2, n);
-	
-	MEM_freeN(st1);
-	MEM_freeN(st2);
-
-	return r;	
-}
-#endif
-
 DIR *opendir (const char *path) {
 	if (GetFileAttributes(path) & FILE_ATTRIBUTE_DIRECTORY) {
 		DIR *newd= MEM_mallocN(sizeof(DIR), "opendir");
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 000a9261d37..d10d970e0d4 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -47,7 +47,7 @@
 #include <stdio.h> // for printf fopen fwrite fclose sprintf FILE
 #include <stdlib.h> // for getenv atoi
 #include <fcntl.h> // for open
-#include <string.h> // for strcasecmp strrchr strncmp strstr
+#include <string.h> // for strrchr strncmp strstr
 #include <math.h> // for fabs
 
 #ifndef WIN32
diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c
index 1a5bb68832e..34796bac9d5 100644
--- a/source/blender/imbuf/intern/jpeg.c
+++ b/source/blender/imbuf/intern/jpeg.c
@@ -55,11 +55,6 @@ static boolean handle_app1 (j_decompress_ptr cinfo);
 static ImBuf * ibJpegImageFromCinfo(struct jpeg_decompress_struct * cinfo, int flags);
 
 
-/* strncasecmp hack */
-#ifdef WIN32
-#define strncasecmp(a, b, n) strncmp(a, b, n)
-#endif
-
 /*
  * In principle there are 4 jpeg formats.
  * 
diff --git a/source/blender/python/api2_2x/gen_utils.c b/source/blender/python/api2_2x/gen_utils.c
index b8e8f92b83e..e23f652641b 100644
--- a/source/blender/python/api2_2x/gen_utils.c
+++ b/source/blender/python/api2_2x/gen_utils.c
@@ -30,13 +30,9 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
 */
 
-#if defined(__WIN32__) || defined(WIN32) || defined(_WIN32)
-	#include <string.h>		
-#else
-	#include <strings.h>	/*for strcasecmp */
-#endif
 #include <DNA_text_types.h>
 #include <MEM_guardedalloc.h>
+#include <BLI_blenlib.h>
 
 #include "gen_utils.h"
 #include "constant.h"
@@ -234,7 +230,7 @@ int EXPP_map_case_getIntVal( const EXPP_map_pair * map, const char *sval,
 			     int *ival )
 {
 	while( map->sval ) {
-		if( !strcasecmp( sval, map->sval ) ) {
+		if( !BLI_strcasecmp( sval, map->sval ) ) {
 			*ival = map->ival;
 			return 1;
 		}
diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c
index 6c2fedd94f1..23137d85341 100644
--- a/source/blender/python/api2_2x/sceneRender.c
+++ b/source/blender/python/api2_2x/sceneRender.c
@@ -928,7 +928,7 @@ PyObject *RenderData_Play( BPy_RenderData * self )
 		BLI_convertstringcode( file, (char *) self->scene,
 				       self->renderContext->cfra );
 		RE_make_existing_file( file );
-		if( strcasecmp( file + strlen( file ) - 4, ".mov" ) ) {
+		if( BLI_strcasecmp( file + strlen( file ) - 4, ".mov" ) ) {
 			sprintf( txt, "%04d_%04d.mov",
 				 ( self->renderContext->sfra ),
 				 ( self->renderContext->efra ) );
@@ -942,7 +942,7 @@ PyObject *RenderData_Play( BPy_RenderData * self )
 		BLI_convertstringcode( file, G.sce,
 				       self->renderContext->cfra );
 		RE_make_existing_file( file );
-		if( strcasecmp( file + strlen( file ) - 4, ".avi" ) ) {
+		if( BLI_strcasecmp( file + strlen( file ) - 4, ".avi" ) ) {
 			sprintf( txt, "%04d_%04d.avi",
 				 ( self->renderContext->sfra ),
 				 ( self->renderContext->efra ) );
diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c
index dd97cec736b..5c59f734345 100644
--- a/source/blender/quicktime/apple/quicktime_export.c
+++ b/source/blender/quicktime/apple/quicktime_export.c
@@ -417,7 +417,7 @@ void makeqtstring (char *string) {
 
 	RE_make_existing_file(string);
 
-	if (strcasecmp(string + strlen(string) - 4, ".mov")) {
+	if (BLI_strcasecmp(string + strlen(string) - 4, ".mov")) {
 		sprintf(txt, "%04d_%04d.mov", (G.scene->r.sfra) , (G.scene->r.efra) );
 		strcat(string, txt);
 	}
diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c
index 01d44def531..219783f54fc 100644
--- a/source/blender/src/filesel.c
+++ b/source/blender/src/filesel.c
@@ -321,7 +321,7 @@ static int compare_name(const void *a1, const void *a2)
 	if( strcmp(entry2->relname, ".")==0 ) return (1);
 	if( strcmp(entry1->relname, "..")==0 ) return (-1);
 	
-	return (strcasecmp(entry1->relname,entry2->relname));
+	return (BLI_strcasecmp(entry1->relname,entry2->relname));
 }
 
 static int compare_date(const void *a1, const void *a2)	
@@ -351,7 +351,7 @@ static int compare_date(const void *a1, const void *a2)
 	if ( entry1->s.st_mtime < entry2->s.st_mtime) return 1;
 	if ( entry1->s.st_mtime > entry2->s.st_mtime) return -1;
 	
-	else return strcasecmp(entry1->relname,entry2->relname);
+	else return BLI_strcasecmp(entry1->relname,entry2->relname);
 }
 
 static int compare_size(const void *a1, const void *a2)	
@@ -380,7 +380,7 @@ static int compare_size(const void *a1, const void *a2)
 	
 	if ( entry1->s.st_size < entry2->s.st_size) return 1;
 	if ( entry1->s.st_size > entry2->s.st_size) return -1;
-	else return strcasecmp(entry1->relname,entry2->relname);
+	else return BLI_strcasecmp(entry1->relname,entry2->relname);
 }
 
 
diff --git a/source/blender/src/imasel.c b/source/blender/src/imasel.c
index 2c233bfe613..c39fe83954e 100644
--- a/source/blender/src/imasel.c
+++ b/source/blender/src/imasel.c
@@ -105,7 +105,7 @@ int dir_compare(const void *a1, const void *a2)
 	use1 = *in1;
 	use2 = *in2;
 	
-	return strcasecmp(use1->name,  use2->name);
+	return BLI_strcasecmp(use1->name,  use2->name);
 }
 
 void issort( int te, ImaDir **firstentry)
@@ -148,7 +148,7 @@ int ima_compare(const void *a1, const void *a2)
 	in2= (OneSelectableIma **)a2;
 
 	use1 = *in1; use2 = *in2;
-	return strcasecmp(use1->file_name,  use2->file_name);
+	return BLI_strcasecmp(use1->file_name,  use2->file_name);
 }
 
 void imsort(OneSelectableIma **firstentry)
diff --git a/source/blender/src/seqaudio.c b/source/blender/src/seqaudio.c
index 794f00ebd7f..463d0244d1e 100644
--- a/source/blender/src/seqaudio.c
+++ b/source/blender/src/seqaudio.c
@@ -108,7 +108,7 @@ static void makewavstring (char *string)
 
 	RE_make_existing_file(string);
 
-	if (strcasecmp(string + strlen(string) - 4, ".wav")) {
+	if (BLI_strcasecmp(string + strlen(string) - 4, ".wav")) {
 		sprintf(txt, "%04d_%04d.wav", (G.scene->r.sfra) , (G.scene->r.efra) );
 		strcat(string, txt);
 	}
diff --git a/source/blender/src/writemovie.c b/source/blender/src/writemovie.c
index b6d5b64de6f..a57728fc69c 100644
--- a/source/blender/src/writemovie.c
+++ b/source/blender/src/writemovie.c
@@ -107,7 +107,7 @@ static void make_movie_name(char *string)
 
 	RE_make_existing_file(string);
 
-	if (strcasecmp(string + len - 3, ".mv")) {
+	if (BLI_strcasecmp(string + len - 3, ".mv")) {
 		sprintf(txt, "%04d_%04d.mv", sfra, efra);
 		strcat(string, txt);
 	}
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 6875a4ace89..7eecabca456 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -267,7 +267,7 @@ int main(int argc, char **argv)
 	// need this.
 
 	BLI_where_am_i(bprogname, argv[0]);
-	
+
 		/* Hack - force inclusion of the plugin api functions,
 		 * see blenpluginapi:pluginapi.c
 		 */
@@ -422,7 +422,7 @@ int main(int argc, char **argv)
 					break;
 				case 'n':
 				case 'N':
-					if (strcasecmp(argv[a], "-noaudio") == 0|| strcasecmp(argv[a], "-nosound") == 0) {
+					if (BLI_strcasecmp(argv[a], "-noaudio") == 0|| BLI_strcasecmp(argv[a], "-nosound") == 0) {
 						/**
 						 	notify the gameengine that no audio is wanted, even if the user didn't give
 						   	the flag -g noaudio.
@@ -432,7 +432,7 @@ int main(int argc, char **argv)
 						audio = 0;
 						if (G.f & G_DEBUG) printf("setting audio to: %d\n", audio);
 					}
-					else if (strcasecmp(argv[a], "-nofrozen") == 0) {
+					else if (BLI_strcasecmp(argv[a], "-nofrozen") == 0) {
 						/* disable initialization of frozen python modules */
 						if (G.f & G_DEBUG) printf("disable frozen modules\n");
 						G.f |= G_NOFROZEN;