Changeset 2035

Timestamp:

Nov 26, 2007, 7:19:40 AM (17 years ago)

Author:

mloskot

Message:

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.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• build/msvc80/geos_python/geos_python.vcproj (modified) (6 diffs)
• build/msvc80/geos_ruby/geos_ruby.vcproj (modified) (6 diffs)
• swig/python/geos_wrap.cxx (modified) (1 diff)

trunk/ChangeLog

@@ -6 +6 @@
           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@loskot.net>

trunk/build/msvc80/geos_python/geos_python.vcproj

@@ -21 +21 @@
                         IntermediateDirectory="$(ConfigurationName)"
                         ConfigurationType="2"
+                        InheritedPropertySheets="..\geos.vsprops"
                         CharacterSet="1"
                         >
@@ -41 +42 @@
                                 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"
@@ -64 +65 @@
                                 OutputFile="$(ConfigurationName)\geos.dll"
                                 LinkIncremental="2"
-                                AdditionalLibraryDirectories="C:\Development\Python25\libs"
+                                AdditionalLibraryDirectories="$(PYTHON_DIR)\libs"
                                 GenerateDebugInformation="true"
                                 SubSystem="2"
@@ -99 +100 @@
                         IntermediateDirectory="$(ConfigurationName)"
                         ConfigurationType="2"
+                        InheritedPropertySheets="..\geos.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
@@ -119 +121 @@
                         <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"
@@ -140 +142 @@
                                 OutputFile="$(ConfigurationName)\geos.dll"
                                 LinkIncremental="1"
-                                AdditionalLibraryDirectories="C:\Development\Python25\libs"
+                                AdditionalLibraryDirectories="$(PYTHON_DIR)\libs"
                                 GenerateDebugInformation="true"
                                 SubSystem="2"

trunk/build/msvc80/geos_ruby/geos_ruby.vcproj

@@ -21 +21 @@
                         IntermediateDirectory="$(ConfigurationName)"
                         ConfigurationType="2"
+                        InheritedPropertySheets="..\geos.vsprops"
                         CharacterSet="1"
                         >
@@ -41 +42 @@
                                 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"
@@ -63 +64 @@
                                 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"
@@ -100 +101 @@
                         IntermediateDirectory="$(ConfigurationName)"
                         ConfigurationType="2"
+                        InheritedPropertySheets="..\geos.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
@@ -120 +122 @@
                         <Tool
                                 Name="VCCLCompilerTool"
+                                AdditionalIncludeDirectories="..\..\..\source\headers;..\..\..\capi;&quot;$(RUBY_INCLUDE_DIR)&quot;"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOS_RUBY_EXPORTS"
                                 RuntimeLibrary="2"
@@ -138 +141 @@
                         <Tool
                                 Name="VCLinkerTool"
+                                AdditionalDependencies="msvcrt-ruby18.lib"
+                                OutputFile="$(RUBY_OUTPUT_DIR)\geos.dll"
                                 LinkIncremental="1"
+                                AdditionalLibraryDirectories="$(RUBY_LIB_DIR)"
                                 GenerateDebugInformation="true"
                                 SubSystem="2"

trunk/swig/python/geos_wrap.cxx

@@ -127 +127 @@
 
 /* Python.h has to appear first */
+#ifdef _DEBUG
+#undef _DEBUG
 #include <Python.h>
+#define _DEBUG
+#undef _CRT_MANIFEST_RETAIL
+#else
+#include <Python.h>
+#endif
 
 /* -----------------------------------------------------------------------------