From 8efb9a38ea64fad8c144a5138c9142354f1de767 Mon Sep 17 00:00:00 2001
From: Sasa Ivetic <sasa@ivetic.ca>
Date: Tue, 13 Dec 2011 01:57:52 +0800
Subject: [PATCH] Moved all Windows related files to win folder

---
 .gitignore                                 | 15 ++++++++-------
 {vcprojects => win}/createHierarchy.vcproj | 14 +++++++-------
 {vcprojects => win}/extractor.vcproj       | 14 +++++++-------
 getopt.c => win/getopt.c                   |  0
 getopt.h => win/getopt.h                   |  0
 {vcprojects => win}/osrm.sln               |  0
 {vcprojects => win}/osrm.vsprops           | 16 ++++++++--------
 {vcprojects => win}/routed.vcproj          | 14 +++++++-------
 unistd.h => win/unistd.h                   |  0
 9 files changed, 37 insertions(+), 36 deletions(-)
 rename {vcprojects => win}/createHierarchy.vcproj (97%)
 rename {vcprojects => win}/extractor.vcproj (97%)
 rename getopt.c => win/getopt.c (100%)
 rename getopt.h => win/getopt.h (100%)
 rename {vcprojects => win}/osrm.sln (100%)
 rename {vcprojects => win}/osrm.vsprops (54%)
 rename {vcprojects => win}/routed.vcproj (97%)
 rename unistd.h => win/unistd.h (100%)

diff --git a/.gitignore b/.gitignore
index 6ce0714bd..52e45c485 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,13 +60,14 @@ DataStructures/pbf-proto/*.pb.cc
 # External Libs #
 #################
 lib/
+win/lib
 
 # Visual Studio Temp + build Files #
 ####################################
-vcprojects/*.user
-vcprojects/*.ncb
-vcprojects/*.suo
-vcprojects/Debug/
-vcprojects/Release/
-bin/
-bin-debug/
\ No newline at end of file
+win/*.user
+win/*.ncb
+win/*.suo
+win/Debug/
+win/Release/
+win/bin/
+win/bin-debug/
\ No newline at end of file
diff --git a/vcprojects/createHierarchy.vcproj b/win/createHierarchy.vcproj
similarity index 97%
rename from vcprojects/createHierarchy.vcproj
rename to win/createHierarchy.vcproj
index a5846c7ce..428c56cc9 100644
--- a/vcprojects/createHierarchy.vcproj
+++ b/win/createHierarchy.vcproj
@@ -18,8 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)..\bin-debug"
-			IntermediateDirectory="$(SolutionDir)..\bin-debug"
+			OutputDirectory="$(SolutionDir)bin-debug"
+			IntermediateDirectory="$(SolutionDir)bin-debug"
 			ConfigurationType="1"
 			InheritedPropertySheets=".\osrm.vsprops"
 			CharacterSet="1"
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_RTLDLL -DBOOST_LIB_DIAGNOSTIC -DSTXXL_BOOST_TIMESTAMP -DSTXXL_BOOST_CONFIG -DSTXXL_BOOST_FILESYSTEM -DSTXXL_BOOST_THREADS -DSTXXL_BOOST_RANDOM /EHsc /EHs /wd4820 /wd4217 /wd4668 /wd4619 /wd4625 /wd4626 /wd4355 /wd4996 -D_SCL_SECURE_NO_DEPRECATE /F 16777216 /nologo "
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(BoostPath)&quot;;&quot;$(StxxlPath)\include&quot;;&quot;$(LibXml2Path)\include&quot;;&quot;$(IconvPath)\include&quot;;&quot;$(SparsehashPath)\src\&quot;;&quot;$(SparsehashPath)\src\windows&quot;;&quot;$(Bzip2Path)\include&quot;;&quot;$(ZlibPath)\include&quot;;..\;&quot;$(ProtobufPath)\include&quot;"
+				AdditionalIncludeDirectories="&quot;$(BoostPath)&quot;;&quot;$(StxxlPath)\include&quot;;&quot;$(LibXml2Path)\include&quot;;&quot;$(IconvPath)\include&quot;;&quot;$(SparsehashPath)\src\&quot;;&quot;$(SparsehashPath)\src\windows&quot;;&quot;$(Bzip2Path)\include&quot;;&quot;$(ZlibPath)\include&quot;;..\;&quot;$(ProtobufPath)\include&quot;;&quot;$(SolutionDir)&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -98,8 +98,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)..\bin"
-			IntermediateDirectory="$(SolutionDir)..\bin"
+			OutputDirectory="$(SolutionDir)bin"
+			IntermediateDirectory="$(SolutionDir)bin"
 			ConfigurationType="1"
 			InheritedPropertySheets=".\osrm.vsprops"
 			CharacterSet="1"
@@ -199,7 +199,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\getopt.h"
+				RelativePath="getopt.h"
 				>
 			</File>
 			<File
@@ -207,7 +207,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\unistd.h"
+				RelativePath="unistd.h"
 				>
 			</File>
 			<Filter
diff --git a/vcprojects/extractor.vcproj b/win/extractor.vcproj
similarity index 97%
rename from vcprojects/extractor.vcproj
rename to win/extractor.vcproj
index 57b9eb2fc..2821f87bb 100644
--- a/vcprojects/extractor.vcproj
+++ b/win/extractor.vcproj
@@ -18,8 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)..\bin-debug"
-			IntermediateDirectory="$(SolutionDir)..\bin-debug"
+			OutputDirectory="$(SolutionDir)bin-debug"
+			IntermediateDirectory="$(SolutionDir)bin-debug"
 			ConfigurationType="1"
 			InheritedPropertySheets=".\osrm.vsprops"
 			CharacterSet="1"
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_RTLDLL -DBOOST_LIB_DIAGNOSTIC -DSTXXL_BOOST_TIMESTAMP -DSTXXL_BOOST_CONFIG -DSTXXL_BOOST_FILESYSTEM -DSTXXL_BOOST_THREADS -DSTXXL_BOOST_RANDOM /EHsc /EHs /wd4820 /wd4217 /wd4668 /wd4619 /wd4625 /wd4626 /wd4355 /wd4996 -D_SCL_SECURE_NO_DEPRECATE /F 16777216 /nologo "
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(BoostPath)&quot;;&quot;$(StxxlPath)\include&quot;;&quot;$(LibXml2Path)\include&quot;;&quot;$(IconvPath)\include&quot;;&quot;$(SparsehashPath)\src\&quot;;&quot;$(SparsehashPath)\src\windows&quot;;&quot;$(Bzip2Path)\include&quot;;&quot;$(ZlibPath)\include&quot;;..\;&quot;$(ProtobufPath)\include&quot;"
+				AdditionalIncludeDirectories="&quot;$(BoostPath)&quot;;&quot;$(StxxlPath)\include&quot;;&quot;$(LibXml2Path)\include&quot;;&quot;$(IconvPath)\include&quot;;&quot;$(SparsehashPath)\src\&quot;;&quot;$(SparsehashPath)\src\windows&quot;;&quot;$(Bzip2Path)\include&quot;;&quot;$(ZlibPath)\include&quot;;..\;&quot;$(ProtobufPath)\include&quot;;&quot;$(SolutionDir)&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -99,8 +99,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)..\bin"
-			IntermediateDirectory="$(SolutionDir)..\bin"
+			OutputDirectory="$(SolutionDir)bin"
+			IntermediateDirectory="$(SolutionDir)bin"
 			ConfigurationType="1"
 			InheritedPropertySheets=".\osrm.vsprops"
 			CharacterSet="1"
@@ -216,7 +216,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\getopt.h"
+				RelativePath="getopt.h"
 				>
 			</File>
 			<File
@@ -224,7 +224,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\unistd.h"
+				RelativePath="unistd.h"
 				>
 			</File>
 			<Filter
diff --git a/getopt.c b/win/getopt.c
similarity index 100%
rename from getopt.c
rename to win/getopt.c
diff --git a/getopt.h b/win/getopt.h
similarity index 100%
rename from getopt.h
rename to win/getopt.h
diff --git a/vcprojects/osrm.sln b/win/osrm.sln
similarity index 100%
rename from vcprojects/osrm.sln
rename to win/osrm.sln
diff --git a/vcprojects/osrm.vsprops b/win/osrm.vsprops
similarity index 54%
rename from vcprojects/osrm.vsprops
rename to win/osrm.vsprops
index 3ce95275f..08d15bee1 100644
--- a/vcprojects/osrm.vsprops
+++ b/win/osrm.vsprops
@@ -6,34 +6,34 @@
 	>
 	<UserMacro
 		Name="BoostPath"
-		Value="$(SolutionDir)..\lib\boost_1_47\"
+		Value="$(SolutionDir)lib\boost_1_47\"
 	/>
 	<UserMacro
 		Name="Bzip2Path"
-		Value="$(SolutionDir)..\lib\bzip2-1.0.6\"
+		Value="$(SolutionDir)lib\bzip2-1.0.6\"
 	/>
 	<UserMacro
 		Name="IconvPath"
-		Value="$(SolutionDir)..\lib\iconv-1.9.2.win32\"
+		Value="$(SolutionDir)lib\iconv-1.9.2.win32\"
 	/>
 	<UserMacro
 		Name="LibXml2Path"
-		Value="$(SolutionDir)..\lib\libxml2-2.7.8.win32\"
+		Value="$(SolutionDir)lib\libxml2-2.7.8.win32\"
 	/>
 	<UserMacro
 		Name="ProtobufPath"
-		Value="$(SolutionDir)..\lib\protobuf-2.4.1\"
+		Value="$(SolutionDir)lib\protobuf-2.4.1\"
 	/>
 	<UserMacro
 		Name="SparsehashPath"
-		Value="$(SolutionDir)..\lib\sparsehash-1.11\"
+		Value="$(SolutionDir)lib\sparsehash-1.11\"
 	/>
 	<UserMacro
 		Name="StxxlPath"
-		Value="$(SolutionDir)..\lib\stxxl-1.3.1\"
+		Value="$(SolutionDir)lib\stxxl-1.3.1\"
 	/>
 	<UserMacro
 		Name="ZlibPath"
-		Value="$(SolutionDir)..\lib\zlib-1.2.5\"
+		Value="$(SolutionDir)lib\zlib-1.2.5\"
 	/>
 </VisualStudioPropertySheet>
diff --git a/vcprojects/routed.vcproj b/win/routed.vcproj
similarity index 97%
rename from vcprojects/routed.vcproj
rename to win/routed.vcproj
index 9b47e3877..8f4c1836b 100644
--- a/vcprojects/routed.vcproj
+++ b/win/routed.vcproj
@@ -18,8 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)..\bin-debug"
-			IntermediateDirectory="$(SolutionDir)..\bin-debug"
+			OutputDirectory="$(SolutionDir)bin-debug"
+			IntermediateDirectory="$(SolutionDir)bin-debug"
 			ConfigurationType="1"
 			InheritedPropertySheets=".\osrm.vsprops"
 			CharacterSet="1"
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_RTLDLL -DBOOST_LIB_DIAGNOSTIC -DSTXXL_BOOST_TIMESTAMP -DSTXXL_BOOST_CONFIG -DSTXXL_BOOST_FILESYSTEM -DSTXXL_BOOST_THREADS -DSTXXL_BOOST_RANDOM /EHsc /EHs /wd4820 /wd4217 /wd4668 /wd4619 /wd4625 /wd4626 /wd4355 /wd4996 -D_SCL_SECURE_NO_DEPRECATE /F 16777216 /nologo "
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(BoostPath)&quot;;&quot;$(StxxlPath)\include&quot;;&quot;$(LibXml2Path)\include&quot;;&quot;$(IconvPath)\include&quot;;&quot;$(SparsehashPath)\src\&quot;;&quot;$(SparsehashPath)\src\windows&quot;;&quot;$(Bzip2Path)\include&quot;;&quot;$(ZlibPath)\include&quot;;..\;&quot;$(ProtobufPath)\include&quot;"
+				AdditionalIncludeDirectories="&quot;$(BoostPath)&quot;;&quot;$(StxxlPath)\include&quot;;&quot;$(LibXml2Path)\include&quot;;&quot;$(IconvPath)\include&quot;;&quot;$(SparsehashPath)\src\&quot;;&quot;$(SparsehashPath)\src\windows&quot;;&quot;$(Bzip2Path)\include&quot;;&quot;$(ZlibPath)\include&quot;;..\;&quot;$(ProtobufPath)\include&quot;;&quot;$(SolutionDir)&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -98,8 +98,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)..\bin"
-			IntermediateDirectory="$(SolutionDir)..\bin"
+			OutputDirectory="$(SolutionDir)bin"
+			IntermediateDirectory="$(SolutionDir)bin"
 			ConfigurationType="1"
 			InheritedPropertySheets=".\osrm.vsprops"
 			CharacterSet="1"
@@ -199,7 +199,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\getopt.h"
+				RelativePath="getopt.h"
 				>
 			</File>
 			<File
@@ -207,7 +207,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\unistd.h"
+				RelativePath="unistd.h"
 				>
 			</File>
 			<Filter
diff --git a/unistd.h b/win/unistd.h
similarity index 100%
rename from unistd.h
rename to win/unistd.h