[geos-commits] r2035 - in trunk: . build/msvc80/geos_python
build/msvc80/geos_ruby swig/python
svn_geos at osgeo.org
svn_geos at osgeo.org
Mon Nov 26 10:19:40 EST 2007
Author: mloskot
Date: 2007-11-26 10:19:40 -0500 (Mon, 26 Nov 2007)
New Revision: 2035
Modified:
trunk/ChangeLog
trunk/build/msvc80/geos_python/geos_python.vcproj
trunk/build/msvc80/geos_ruby/geos_ruby.vcproj
trunk/swig/python/geos_wrap.cxx
Log:
Added common Property Sheet for Visual C++ projects where Python and Ruby macros/locations are defined. Fixed include of Python.h, see Ticket #164 for details.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-11-26 06:21:13 UTC (rev 2034)
+++ trunk/ChangeLog 2007-11-26 15:19:40 UTC (rev 2035)
@@ -5,6 +5,13 @@
and geos_c.h.vc to headers used by Visual C++
source\headers\geos\version.h.vc: added test if used
with Visual C++ compiler
+ * build\msvc80\geos.vsprops,
+ * build\msvc80\geos_python\geos_python.vcproj,
+ * build\msvc80\geos_ruby\geos_ruby.vcproj: added common
+ Property Sheet for Visual C++ projects where Python and
+ Ruby macros/locations are defined.
+ * swig\python\geos_wrap.cxx: Fixed include of Python.h,
+ see Ticket #164 for details.
2007-11-22 Mateusz Loskot <mateusz at loskot.net>
Modified: trunk/build/msvc80/geos_python/geos_python.vcproj
===================================================================
--- trunk/build/msvc80/geos_python/geos_python.vcproj 2007-11-26 06:21:13 UTC (rev 2034)
+++ trunk/build/msvc80/geos_python/geos_python.vcproj 2007-11-26 15:19:40 UTC (rev 2035)
@@ -20,6 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
+ InheritedPropertySheets="..\geos.vsprops"
CharacterSet="1"
>
<Tool
@@ -40,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\source\headers;..\..\..\capi;C:\Development\Python25\include"
+ AdditionalIncludeDirectories="..\..\..\source\headers;..\..\..\capi;"$(PYTHON_DIR)\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GEOS_PYTHON_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,7 +64,7 @@
Name="VCLinkerTool"
OutputFile="$(ConfigurationName)\geos.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Development\Python25\libs"
+ AdditionalLibraryDirectories="$(PYTHON_DIR)\libs"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -98,6 +99,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
+ InheritedPropertySheets="..\geos.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -118,7 +120,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\source\headers;..\..\..\capi;C:\Development\Python25\include"
+ AdditionalIncludeDirectories="..\..\..\source\headers;..\..\..\capi;$(PYTHON_DIR)\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOS_PYTHON_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -139,7 +141,7 @@
Name="VCLinkerTool"
OutputFile="$(ConfigurationName)\geos.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Development\Python25\libs"
+ AdditionalLibraryDirectories="$(PYTHON_DIR)\libs"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/build/msvc80/geos_ruby/geos_ruby.vcproj
===================================================================
--- trunk/build/msvc80/geos_ruby/geos_ruby.vcproj 2007-11-26 06:21:13 UTC (rev 2034)
+++ trunk/build/msvc80/geos_ruby/geos_ruby.vcproj 2007-11-26 15:19:40 UTC (rev 2035)
@@ -20,6 +20,7 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
+ InheritedPropertySheets="..\geos.vsprops"
CharacterSet="1"
>
<Tool
@@ -40,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\source\headers;..\..\..\capi;"C:\Development\ruby\lib\ruby\1.8\i386-mswin32""
+ AdditionalIncludeDirectories="..\..\..\source\headers;..\..\..\capi;"$(RUBY_INCLUDE_DIR)""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GEOS_RUBY_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -62,9 +63,9 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="msvcrt-ruby18.lib"
- OutputFile="C:\Development\ruby\lib\ruby\site_ruby\1.8\i386-msvcrt\geos.dll"
+ OutputFile="$(RUBY_OUTPUT_DIR)\geos.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Development\ruby\lib"
+ AdditionalLibraryDirectories="$(RUBY_LIB_DIR)"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -99,6 +100,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
+ InheritedPropertySheets="..\geos.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -119,6 +121,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\source\headers;..\..\..\capi;"$(RUBY_INCLUDE_DIR)""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOS_RUBY_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -137,7 +140,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="msvcrt-ruby18.lib"
+ OutputFile="$(RUBY_OUTPUT_DIR)\geos.dll"
LinkIncremental="1"
+ AdditionalLibraryDirectories="$(RUBY_LIB_DIR)"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/swig/python/geos_wrap.cxx
===================================================================
--- trunk/swig/python/geos_wrap.cxx 2007-11-26 06:21:13 UTC (rev 2034)
+++ trunk/swig/python/geos_wrap.cxx 2007-11-26 15:19:40 UTC (rev 2035)
@@ -126,7 +126,14 @@
/* Python.h has to appear first */
+#ifdef _DEBUG
+#undef _DEBUG
#include <Python.h>
+#define _DEBUG
+#undef _CRT_MANIFEST_RETAIL
+#else
+#include <Python.h>
+#endif
/* -----------------------------------------------------------------------------
* swigrun.swg
More information about the geos-commits
mailing list