[geos-commits] r2820 - in trunk/build: msvc80/geos_lib msvc90/geos_lib

svn_geos at osgeo.org svn_geos at osgeo.org
Wed Dec 9 06:05:34 EST 2009


Author: mloskot
Date: 2009-12-09 06:05:31 -0500 (Wed, 09 Dec 2009)
New Revision: 2820

Modified:
   trunk/build/msvc80/geos_lib/geos_lib.vcproj
   trunk/build/msvc90/geos_lib/geos_lib.vcproj
Log:
* Fixed generation of platform.h as pre-build step of GEOS lib project for Visual C++ 2005 and 2008
* Added missing headers.

Modified: trunk/build/msvc80/geos_lib/geos_lib.vcproj
===================================================================
--- trunk/build/msvc80/geos_lib/geos_lib.vcproj	2009-12-08 22:56:29 UTC (rev 2819)
+++ trunk/build/msvc80/geos_lib/geos_lib.vcproj	2009-12-09 11:05:31 UTC (rev 2820)
@@ -24,6 +24,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Copying ..\..\..\source\headers\geos\platform.h.vc to ..\..\..\source\headers\geos\platform.h"
+				CommandLine="copy ..\..\..\source\headers\geos\platform.h.vc ..\..\..\source\headers\geos\platform.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -50,8 +52,9 @@
 				UsePrecompiledHeader="0"
 				BrowseInformation="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
+				ShowIncludes="false"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -92,6 +95,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Copying ..\..\..\source\headers\geos\platform.h.vc to ..\..\..\source\headers\geos\platform.h"
+				CommandLine="copy ..\..\..\source\headers\geos\platform.h.vc ..\..\..\source\headers\geos\platform.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -111,8 +116,8 @@
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;NOGDI"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="0"
 			/>
 			<Tool
@@ -3069,6 +3074,46 @@
 							>
 						</File>
 					</Filter>
+					<Filter
+						Name="linearref"
+						>
+						<File
+							RelativePath="..\..\..\source\headers\geos\linearref\ExtractLineByLocation.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\source\headers\geos\linearref\LengthIndexedLine.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\source\headers\geos\linearref\LengthIndexOfPoint.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\source\headers\geos\linearref\LengthLocationMap.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\source\headers\geos\linearref\LinearGeometryBuilder.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\source\headers\geos\linearref\LinearIterator.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\source\headers\geos\linearref\LinearLocation.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\source\headers\geos\linearref\LocationIndexOfLine.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\source\headers\geos\linearref\LocationIndexOfPoint.h"
+							>
+						</File>
+					</Filter>
 				</Filter>
 			</Filter>
 			<Filter
@@ -3187,6 +3232,10 @@
 				RelativePath="..\..\..\capi\geos_ts_c.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\capi\Makefile.am"
+				>
+			</File>
 		</Filter>
 		<File
 			RelativePath="..\..\..\makefile.vc"

Modified: trunk/build/msvc90/geos_lib/geos_lib.vcproj
===================================================================
--- trunk/build/msvc90/geos_lib/geos_lib.vcproj	2009-12-08 22:56:29 UTC (rev 2819)
+++ trunk/build/msvc90/geos_lib/geos_lib.vcproj	2009-12-09 11:05:31 UTC (rev 2820)
@@ -25,6 +25,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Copying ..\..\..\source\headers\geos\platform.h.vc to ..\..\..\source\headers\geos\platform.h"
+				CommandLine="copy ..\..\..\source\headers\geos\platform.h.vc ..\..\..\source\headers\geos\platform.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -94,6 +96,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Copying ..\..\..\source\headers\geos\platform.h.vc to ..\..\..\source\headers\geos\platform.h"
+				CommandLine="copy ..\..\..\source\headers\geos\platform.h.vc ..\..\..\source\headers\geos\platform.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -162,6 +166,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\source\Makefile.am"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\source\Makefile.vc"
 				>
 			</File>
@@ -1570,6 +1578,10 @@
 					Name="geos"
 					>
 					<File
+						RelativePath="..\..\..\source\headers\geos\config.h"
+						>
+					</File>
+					<File
 						RelativePath="..\..\..\source\headers\geos\export.h"
 						>
 					</File>
@@ -1586,6 +1598,10 @@
 						>
 					</File>
 					<File
+						RelativePath="..\..\..\source\headers\geos\geomPrep.h"
+						>
+					</File>
+					<File
 						RelativePath="..\..\..\source\headers\geos\geomUtil.h"
 						>
 					</File>
@@ -1602,6 +1618,10 @@
 						>
 					</File>
 					<File
+						RelativePath="..\..\..\source\headers\geos\indexIntervalRTree.h"
+						>
+					</File>
+					<File
 						RelativePath="..\..\..\source\headers\geos\indexQuadtree.h"
 						>
 					</File>
@@ -1753,6 +1773,18 @@
 						Name="algorithm"
 						>
 						<File
+							RelativePath="..\..\..\source\headers\geos\algorithm\Angle.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\source\headers\geos\algorithm\BoundaryNodeRule.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\source\headers\geos\algorithm\CentralEndpointIntersector.h"
+							>
+						</File>
+						<File
 							RelativePath="..\..\..\source\headers\geos\algorithm\CentroidArea.h"
 							>
 						</File>
@@ -1848,6 +1880,22 @@
 								>
 							</File>
 						</Filter>
+						<Filter
+							Name="distance"
+							>
+							<File
+								RelativePath="..\..\..\source\headers\geos\algorithm\distance\DiscreteHausdorffDistance.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\..\source\headers\geos\algorithm\distance\DistanceToPoint.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\..\source\headers\geos\algorithm\distance\PointPairDistance.h"
+								>
+							</File>
+						</Filter>
 					</Filter>
 					<Filter
 						Name="geom"
@@ -1893,6 +1941,10 @@
 							>
 						</File>
 						<File
+							RelativePath="..\..\..\source\headers\geos\geom\CoordinateSequenceFilter.h"
+							>
+						</File>
+						<File
 							RelativePath="..\..\..\source\headers\geos\geom\Dimension.h"
 							>
 						</File>
@@ -2257,6 +2309,14 @@
 						Name="noding"
 						>
 						<File
+							RelativePath="..\..\..\source\headers\geos\noding\BasicSegmentString.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\source\headers\geos\noding\FastNodingValidator.h"
+							>
+						</File>
+						<File
 							RelativePath="..\..\..\source\headers\geos\noding\FastSegmentSetIntersectionFinder.h"
 							>
 						</File>
@@ -2305,6 +2365,10 @@
 							>
 						</File>
 						<File
+							RelativePath="..\..\..\source\headers\geos\noding\OrientedCoordinateArray.h"
+							>
+						</File>
+						<File
 							RelativePath="..\..\..\source\headers\geos\noding\ScaledNoder.h"
 							>
 						</File>
@@ -2345,6 +2409,10 @@
 							>
 						</File>
 						<File
+							RelativePath="..\..\..\source\headers\geos\noding\SingleInteriorIntersectionFinder.h"
+							>
+						</File>
+						<File
 							RelativePath="..\..\..\source\headers\geos\noding\SinglePassNoder.h"
 							>
 						</File>
@@ -2381,10 +2449,6 @@
 						Name="operation"
 						>
 						<File
-							RelativePath="..\..\..\source\headers\geos\operation\EndpointInfo.h"
-							>
-						</File>
-						<File
 							RelativePath="..\..\..\source\headers\geos\operation\GeometryGraphOperation.h"
 							>
 						</File>
@@ -2713,6 +2777,10 @@
 							>
 						</File>
 						<File
+							RelativePath="..\..\..\source\headers\geos\io\CLocalizer.h"
+							>
+						</File>
+						<File
 							RelativePath="..\..\..\source\headers\geos\io\ParseException.h"
 							>
 						</File>
@@ -2977,6 +3045,14 @@
 							>
 						</File>
 						<File
+							RelativePath="..\..\..\source\headers\geos\precision\GeometrySnapper.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\source\headers\geos\precision\LineStringSnapper.h"
+							>
+						</File>
+						<File
 							RelativePath="..\..\..\source\headers\geos\precision\SimpleGeometryPrecisionReducer.h"
 							>
 						</File>
@@ -3155,8 +3231,8 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="copy $(InputDir)$(InputFileName) $(InputDir)$(InputName)"
-						CommandLine="copy &quot;$(InputDir)$(InputFileName)&quot; &quot;$(InputDir)$(InputName)&quot;"
+						Description="copy &quot;$(InputDir)$(InputFileName)&quot; &quot;$(InputDir)$(InputName)&quot;"
+						CommandLine="copy &quot;$(InputDir)$(InputFileName)&quot; &quot;$(InputDir)$(InputName)&quot;&#x0D;&#x0A;"
 						Outputs="$(InputDir)$(InputName)"
 					/>
 				</FileConfiguration>
@@ -3165,8 +3241,8 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="copy $(InputDir)$(InputFileName) $(InputDir)$(InputName)"
-						CommandLine="copy &quot;$(InputDir)$(InputFileName)&quot; &quot;$(InputDir)$(InputName)&quot;"
+						Description="copy &quot;$(InputDir)$(InputFileName)&quot; &quot;$(InputDir)$(InputName)&quot;"
+						CommandLine="copy &quot;$(InputDir)$(InputFileName)&quot; &quot;$(InputDir)$(InputName)&quot;&#x0D;&#x0A;"
 						Outputs="$(InputDir)$(InputName)"
 					/>
 				</FileConfiguration>
@@ -3181,7 +3257,7 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath=".\Makefile.am"
+			RelativePath="..\..\..\makefile.vc"
 			>
 		</File>
 	</Files>



More information about the geos-commits mailing list