From 29a9fbdad29b85e5a1926ad8a0633aa9ee1d53bf Mon Sep 17 00:00:00 2001
From: Frederic Bouvier <fredfgfs01@free.fr>
Date: Wed, 4 Feb 2009 19:46:36 +0100
Subject: [PATCH] Add ogr-decode to the MSVC 7.1 solution

---
 projects/VC7.1/ogr-decode/.gitignore        |   2 +
 projects/VC7.1/ogr-decode/ogr-decode.vcproj | 140 ++++++++++++++++++++
 projects/VC7.1/terragear.sln                |  12 ++
 src/Prep/OGRDecode/ogr-decode.cxx           |  13 +-
 4 files changed, 157 insertions(+), 10 deletions(-)
 create mode 100644 projects/VC7.1/ogr-decode/.gitignore
 create mode 100644 projects/VC7.1/ogr-decode/ogr-decode.vcproj

diff --git a/projects/VC7.1/ogr-decode/.gitignore b/projects/VC7.1/ogr-decode/.gitignore
new file mode 100644
index 00000000..0f3a6b1b
--- /dev/null
+++ b/projects/VC7.1/ogr-decode/.gitignore
@@ -0,0 +1,2 @@
+Debug
+Release
diff --git a/projects/VC7.1/ogr-decode/ogr-decode.vcproj b/projects/VC7.1/ogr-decode/ogr-decode.vcproj
new file mode 100644
index 00000000..f8a8ae9b
--- /dev/null
+++ b/projects/VC7.1/ogr-decode/ogr-decode.vcproj
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="ogr-decode"
+	ProjectGUID="{376BFCF2-D8AF-48C1-ACFD-07E124DC6BB0}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin\Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\SimGear.cs;..\..\..\..;..\..\..\..\3rdParty\include;..\..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\src\Lib;..\..\..\src\BuildTiles;..\..\..\..\gpc232"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NOMINMAX"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ul_d.lib sg_d.lib zlibd.lib gdal_id.lib"
+				OutputFile="$(OutDir)/ogr-decode.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\..\plib;..\..\..\..\3rdParty\lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/ogr-decode.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\bin\Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\..\SimGear.cs;..\..\..\..;..\..\..\..\3rdParty\include;..\..\..\..\install\msvc71\OpenSceneGraph\include;..\..\..\src\Lib;..\..\..\src\BuildTiles;..\..\..\..\gpc232"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NOMINMAX"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ul.lib sg.lib zlib.lib gdal_i.lib"
+				OutputFile="$(OutDir)/ogr-decode.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\..\plib;..\..\..\..\3rdParty\lib"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\..\src\Prep\OGRDecode\ogr-decode.cxx">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/projects/VC7.1/terragear.sln b/projects/VC7.1/terragear.sln
index 84228ac3..db68b2c9 100644
--- a/projects/VC7.1/terragear.sln
+++ b/projects/VC7.1/terragear.sln
@@ -219,6 +219,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "terrafit", "terrafit\terraf
 		{22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogr-decode", "ogr-decode\ogr-decode.vcproj", "{376BFCF2-D8AF-48C1-ACFD-07E124DC6BB0}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9AABEE2B-19BC-4479-ADBE-58CA0A8BBC93} = {9AABEE2B-19BC-4479-ADBE-58CA0A8BBC93}
+		{610D5DAE-45EC-446E-86F2-73FDD24449C9} = {610D5DAE-45EC-446E-86F2-73FDD24449C9}
+		{B1FB93BB-ED1D-40A1-9B35-FCC232F473FD} = {B1FB93BB-ED1D-40A1-9B35-FCC232F473FD}
+		{22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -381,6 +389,10 @@ Global
 		{F6CEF65C-4643-41AC-8A7D-078BACA6EF67}.Debug.Build.0 = Debug|Win32
 		{F6CEF65C-4643-41AC-8A7D-078BACA6EF67}.Release.ActiveCfg = Release|Win32
 		{F6CEF65C-4643-41AC-8A7D-078BACA6EF67}.Release.Build.0 = Release|Win32
+		{376BFCF2-D8AF-48C1-ACFD-07E124DC6BB0}.Debug.ActiveCfg = Debug|Win32
+		{376BFCF2-D8AF-48C1-ACFD-07E124DC6BB0}.Debug.Build.0 = Debug|Win32
+		{376BFCF2-D8AF-48C1-ACFD-07E124DC6BB0}.Release.ActiveCfg = Release|Win32
+		{376BFCF2-D8AF-48C1-ACFD-07E124DC6BB0}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/src/Prep/OGRDecode/ogr-decode.cxx b/src/Prep/OGRDecode/ogr-decode.cxx
index 94882783..7674020c 100644
--- a/src/Prep/OGRDecode/ogr-decode.cxx
+++ b/src/Prep/OGRDecode/ogr-decode.cxx
@@ -41,10 +41,6 @@
 
 #include <ogrsf_frmts.h>
 
-#ifdef _MSC_VER
-#  include <Win32/mkdir.hpp>
-#endif
-
 using std:: cout ;
 using std:: string ;
 using std:: map ;
@@ -487,12 +483,9 @@ int main( int argc, char **argv ) {
     work_dir=argv[1];
     datasource=argv[2];
 
-#ifdef _MSC_VER
-    fg_mkdir( work_dir.c_str() );
-#else
-    string command = "mkdir -p " + work_dir;
-    system( command.c_str() );
-#endif
+    SGPath sgp( work_dir );
+    sgp.append( "dummy" );
+    sgp.create_dir( 0755 );
 
     // initialize persistant polygon counter
     string counter_file = work_dir + "/poly_counter";