[geos-commits] r2609 - in trunk/build/msvc90: geos_c_dll geos_lib
geos_unit
svn_geos at osgeo.org
svn_geos at osgeo.org
Sun Jul 5 11:58:37 EDT 2009
Author: strk
Date: 2009-07-05 11:58:37 -0400 (Sun, 05 Jul 2009)
New Revision: 2609
Modified:
trunk/build/msvc90/geos_c_dll/geos_c_dll.vcproj
trunk/build/msvc90/geos_lib/geos_lib.vcproj
trunk/build/msvc90/geos_unit/geos_unit.vcproj
Log:
Apply fix-msvc90-only2.patch by Sanak from issue #273
Modified: trunk/build/msvc90/geos_c_dll/geos_c_dll.vcproj
===================================================================
--- trunk/build/msvc90/geos_c_dll/geos_c_dll.vcproj 2009-07-04 16:19:43 UTC (rev 2608)
+++ trunk/build/msvc90/geos_c_dll/geos_c_dll.vcproj 2009-07-05 15:58:37 UTC (rev 2609)
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\capi;..\..\..\source\headers"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;NOGDI;GEOS_DLL_LIBRARY"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;NOGDI;GEOS_DLL_EXPORT"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -119,7 +119,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\capi;..\..\..\source\headers"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;NOGDI;GEOS_DLL_LIBRARY"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;NOGDI;GEOS_DLL_EXPORT"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Modified: trunk/build/msvc90/geos_lib/geos_lib.vcproj
===================================================================
--- trunk/build/msvc90/geos_lib/geos_lib.vcproj 2009-07-04 16:19:43 UTC (rev 2608)
+++ trunk/build/msvc90/geos_lib/geos_lib.vcproj 2009-07-05 15:58:37 UTC (rev 2609)
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\capi;..\..\..\source\headers"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;NOGDI;GEOS_DLL_LIBRARY_STATIC"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;NOGDI"
IgnoreStandardIncludePath="false"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -109,7 +109,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\source\headers"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;NOGDI;GEOS_DLL_LIBRARY_STATIC"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;NOGDI"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -1601,7 +1601,7 @@
Name="geos"
>
<File
- RelativePath="..\..\..\source\headers\geos\config.h"
+ RelativePath="..\..\..\source\headers\geos\export.h"
>
</File>
<File
Modified: trunk/build/msvc90/geos_unit/geos_unit.vcproj
===================================================================
--- trunk/build/msvc90/geos_unit/geos_unit.vcproj 2009-07-04 16:19:43 UTC (rev 2608)
+++ trunk/build/msvc90/geos_unit/geos_unit.vcproj 2009-07-05 15:58:37 UTC (rev 2609)
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\;..\..\..\tests\unit;..\..\..\tests\unit\tut;..\..\..\capi;..\..\..\source\headers"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;NOGDI;GEOS_DLL_LIBRARY"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;NOGDI"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -121,7 +121,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\;..\..\..\tests\unit;..\..\..\tests\unit\tut;..\..\..\capi;..\..\..\source\headers"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;NOGDI;GEOS_DLL_LIBRARY"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;NOGDI"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -510,8 +510,20 @@
Name="VCCLCompilerTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\tests\unit\capi\GEOSBufferTest.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\tests\unit\capi\GEOSContainsTest.cpp"
>
</File>
@@ -550,6 +562,14 @@
Name="VCCLCompilerTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\tests\unit\capi\GEOSWithinTest.cpp"
@@ -566,6 +586,14 @@
Name="VCCLCompilerTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
</Filter>
<File
More information about the geos-commits
mailing list