Moved all Windows related files to win folder

This commit is contained in:
Sasa Ivetic 2011-12-13 01:57:52 +08:00 committed by Project OSRM
parent 8e1d69ac8b
commit 8efb9a38ea
9 changed files with 37 additions and 36 deletions

15
.gitignore vendored
View File

@ -60,13 +60,14 @@ DataStructures/pbf-proto/*.pb.cc
# External Libs # # External Libs #
################# #################
lib/ lib/
win/lib
# Visual Studio Temp + build Files # # Visual Studio Temp + build Files #
#################################### ####################################
vcprojects/*.user win/*.user
vcprojects/*.ncb win/*.ncb
vcprojects/*.suo win/*.suo
vcprojects/Debug/ win/Debug/
vcprojects/Release/ win/Release/
bin/ win/bin/
bin-debug/ win/bin-debug/

View File

@ -18,8 +18,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(SolutionDir)..\bin-debug" OutputDirectory="$(SolutionDir)bin-debug"
IntermediateDirectory="$(SolutionDir)..\bin-debug" IntermediateDirectory="$(SolutionDir)bin-debug"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\osrm.vsprops" InheritedPropertySheets=".\osrm.vsprops"
CharacterSet="1" CharacterSet="1"
@ -43,7 +43,7 @@
Name="VCCLCompilerTool" 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 " 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" 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" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -98,8 +98,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)..\bin" OutputDirectory="$(SolutionDir)bin"
IntermediateDirectory="$(SolutionDir)..\bin" IntermediateDirectory="$(SolutionDir)bin"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\osrm.vsprops" InheritedPropertySheets=".\osrm.vsprops"
CharacterSet="1" CharacterSet="1"
@ -199,7 +199,7 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File <File
RelativePath="..\getopt.h" RelativePath="getopt.h"
> >
</File> </File>
<File <File
@ -207,7 +207,7 @@
> >
</File> </File>
<File <File
RelativePath="..\unistd.h" RelativePath="unistd.h"
> >
</File> </File>
<Filter <Filter

View File

@ -18,8 +18,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(SolutionDir)..\bin-debug" OutputDirectory="$(SolutionDir)bin-debug"
IntermediateDirectory="$(SolutionDir)..\bin-debug" IntermediateDirectory="$(SolutionDir)bin-debug"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\osrm.vsprops" InheritedPropertySheets=".\osrm.vsprops"
CharacterSet="1" CharacterSet="1"
@ -44,7 +44,7 @@
Name="VCCLCompilerTool" 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 " 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" 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" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -99,8 +99,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)..\bin" OutputDirectory="$(SolutionDir)bin"
IntermediateDirectory="$(SolutionDir)..\bin" IntermediateDirectory="$(SolutionDir)bin"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\osrm.vsprops" InheritedPropertySheets=".\osrm.vsprops"
CharacterSet="1" CharacterSet="1"
@ -216,7 +216,7 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File <File
RelativePath="..\getopt.h" RelativePath="getopt.h"
> >
</File> </File>
<File <File
@ -224,7 +224,7 @@
> >
</File> </File>
<File <File
RelativePath="..\unistd.h" RelativePath="unistd.h"
> >
</File> </File>
<Filter <Filter

View File

@ -6,34 +6,34 @@
> >
<UserMacro <UserMacro
Name="BoostPath" Name="BoostPath"
Value="$(SolutionDir)..\lib\boost_1_47\" Value="$(SolutionDir)lib\boost_1_47\"
/> />
<UserMacro <UserMacro
Name="Bzip2Path" Name="Bzip2Path"
Value="$(SolutionDir)..\lib\bzip2-1.0.6\" Value="$(SolutionDir)lib\bzip2-1.0.6\"
/> />
<UserMacro <UserMacro
Name="IconvPath" Name="IconvPath"
Value="$(SolutionDir)..\lib\iconv-1.9.2.win32\" Value="$(SolutionDir)lib\iconv-1.9.2.win32\"
/> />
<UserMacro <UserMacro
Name="LibXml2Path" Name="LibXml2Path"
Value="$(SolutionDir)..\lib\libxml2-2.7.8.win32\" Value="$(SolutionDir)lib\libxml2-2.7.8.win32\"
/> />
<UserMacro <UserMacro
Name="ProtobufPath" Name="ProtobufPath"
Value="$(SolutionDir)..\lib\protobuf-2.4.1\" Value="$(SolutionDir)lib\protobuf-2.4.1\"
/> />
<UserMacro <UserMacro
Name="SparsehashPath" Name="SparsehashPath"
Value="$(SolutionDir)..\lib\sparsehash-1.11\" Value="$(SolutionDir)lib\sparsehash-1.11\"
/> />
<UserMacro <UserMacro
Name="StxxlPath" Name="StxxlPath"
Value="$(SolutionDir)..\lib\stxxl-1.3.1\" Value="$(SolutionDir)lib\stxxl-1.3.1\"
/> />
<UserMacro <UserMacro
Name="ZlibPath" Name="ZlibPath"
Value="$(SolutionDir)..\lib\zlib-1.2.5\" Value="$(SolutionDir)lib\zlib-1.2.5\"
/> />
</VisualStudioPropertySheet> </VisualStudioPropertySheet>

View File

@ -18,8 +18,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(SolutionDir)..\bin-debug" OutputDirectory="$(SolutionDir)bin-debug"
IntermediateDirectory="$(SolutionDir)..\bin-debug" IntermediateDirectory="$(SolutionDir)bin-debug"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\osrm.vsprops" InheritedPropertySheets=".\osrm.vsprops"
CharacterSet="1" CharacterSet="1"
@ -43,7 +43,7 @@
Name="VCCLCompilerTool" 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 " 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" 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" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -98,8 +98,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)..\bin" OutputDirectory="$(SolutionDir)bin"
IntermediateDirectory="$(SolutionDir)..\bin" IntermediateDirectory="$(SolutionDir)bin"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\osrm.vsprops" InheritedPropertySheets=".\osrm.vsprops"
CharacterSet="1" CharacterSet="1"
@ -199,7 +199,7 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File <File
RelativePath="..\getopt.h" RelativePath="getopt.h"
> >
</File> </File>
<File <File
@ -207,7 +207,7 @@
> >
</File> </File>
<File <File
RelativePath="..\unistd.h" RelativePath="unistd.h"
> >
</File> </File>
<Filter <Filter