fly/terragear
1
0
Fork 0
Code Activity

Add poly2ogr to the MSVC 7.1 solution

Browse source
This commit is contained in:
Frederic Bouvier 2009-02-12 09:17:34 +01:00 committed by Ralf Gerlich
parent f015af865d
commit 1cd0506c3c
5 changed files with 165 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
projects/VC7.1/poly2ogr/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
Debug
Release

140
projects/VC7.1/poly2ogr/poly2ogr.vcproj Normal file
View file

@ -0,0 +1,140 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="poly2ogr"
ProjectGUID="{74F5BBD4-D669-4348-8B46-11700135CCF1}"
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;..\..\..\src"
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)/poly2ogr.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\plib;..\..\..\..\3rdParty\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/poly2ogr.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;..\..\..\src"
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)/poly2ogr.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\Utils\poly2ogr\poly2ogr.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>

10
projects/VC7.1/terragear.sln
View file

@ -227,6 +227,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgfs-tools-server", "fgfs-t
{22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "poly2ogr", "poly2ogr\poly2ogr.vcproj", "{74F5BBD4-D669-4348-8B46-11700135CCF1}"
ProjectSection(ProjectDependencies) = postProject
{F74722A5-4015-453B-BF4F-161A4766DDA1} = {F74722A5-4015-453B-BF4F-161A4766DDA1}
{22540CD3-D3CA-4C86-A773-80AEEE3ACDED} = {22540CD3-D3CA-4C86-A773-80AEEE3ACDED}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@ -393,6 +399,10 @@ Global
{5086D5EB-5EC0-437F-8181-264315F21A17}.Debug.Build.0 = Debug|Win32
{5086D5EB-5EC0-437F-8181-264315F21A17}.Release.ActiveCfg = Release|Win32
{5086D5EB-5EC0-437F-8181-264315F21A17}.Release.Build.0 = Release|Win32
{74F5BBD4-D669-4348-8B46-11700135CCF1}.Debug.ActiveCfg = Debug|Win32
{74F5BBD4-D669-4348-8B46-11700135CCF1}.Debug.Build.0 = Debug|Win32
{74F5BBD4-D669-4348-8B46-11700135CCF1}.Release.ActiveCfg = Release|Win32
{74F5BBD4-D669-4348-8B46-11700135CCF1}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection

2
src/Utils/poly2ogr/Makefile.am
View file

@ -7,6 +7,6 @@ poly2ogr_CXXFLAGS=$(GDAL_CFLAGS)
poly2ogr_LDADD = \
$(GDAL_LIBS) \
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
-lsgstructure -lsgmisc -lsgdebug -lz
-lsgstructure -lsgmisc -lsgdebug -lz -lplibul
INCLUDES = -I$(top_srcdir)/src/Lib

20
src/Utils/poly2ogr/poly2ogr.cxx
View file

@ -27,9 +27,13 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <getopt.h>
#include <dirent.h>
#include <unistd.h>
#ifdef _MSC_VER
# define S_ISDIR(a) ((a)&_S_IFDIR)
# include <Prep/Terra/getopt.h>
#else
# include <getopt.h>
# include <unistd.h>
#endif
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/sgstream.hxx>
@ -264,17 +268,17 @@ void process_file(const std::string& path) {
}
if (S_ISDIR(sbuf.st_mode)) {
DIR* dir;
ulDir* dir;
dir=opendir(path.c_str());
dir=ulOpenDir(path.c_str());
if (!dir) {
SG_LOG(SG_GENERAL, SG_ALERT, "Unable to open directory '" << path << "'");
return;
}
struct dirent *de;
struct ulDirEnt *de;
while ((de=readdir(dir))) {
while ((de=ulReadDir(dir))) {
if (!strcmp(de->d_name,".") || !strcmp(de->d_name,"..")) {
continue;
}
@ -283,7 +287,7 @@ void process_file(const std::string& path) {
process_file(subpath);
}
closedir(dir);
ulCloseDir(dir);
} else if (endswith(path,".pts")) {
// This is a points file
process_points_file(path);