[geos-commits] r2033 - in trunk: . source source/headers/geos

[svn_geos at osgeo.org]

Author: mloskot
Date: 2007-11-26 01:16:14 -0500 (Mon, 26 Nov 2007)
New Revision: 2033

Modified:
   trunk/ChangeLog
   trunk/source/Makefile.vc
   trunk/source/headers/geos/version.h.vc
Log:
Enabled target copying version.h.vc and geos_c.h.vc to headers used by Visual C++. Added test if version.h.vc is used with Visual C++.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-11-23 02:33:41 UTC (rev 2032)
+++ trunk/ChangeLog	2007-11-26 06:16:14 UTC (rev 2033)
@@ -1,4 +1,11 @@
 
+2007-11-26 Mateusz Loskot <mateusz at loskot.net>
+
+	* source\Makefile.vc: enabled target copying version.h.vc
+	  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
+
 2007-11-22 Mateusz Loskot <mateusz at loskot.net>
 
 	* source/headers/geos/io/WKBWriter.h: added purifying cast of 

Modified: trunk/source/Makefile.vc
===================================================================
--- trunk/source/Makefile.vc	2007-11-23 02:33:41 UTC (rev 2032)
+++ trunk/source/Makefile.vc	2007-11-26 06:16:14 UTC (rev 2033)
@@ -330,13 +330,13 @@
 
 # version.h should already be in distribution, if is not you'll
 # have to run ./configure to recreate
-#headers/geos/version.h: headers/geos/version.h.vc
-#    copy headers\geos\version.h.vc headers\geos\version.h
+headers/geos/version.h: headers/geos/version.h.vc
+	copy headers\geos\version.h.vc headers\geos\version.h
 
 # geos_c.h should already be in distribution, if is not you'll
 # have to run ./configure to recreate
-#capi/geos_c.h: ../capi/geos_c.h.vc
-#	copy ..\capi\geos_c.h.vc ..\capi\geos_c.h
+../capi/geos_c.h: ../capi/geos_c.h.in.
+	copy ..\capi\geos_c.h.in ..\capi\geos_c.h
    
 .cpp.obj:
 	$(CC) $(CFLAGS) /c $*.cpp /Fo$@

Modified: trunk/source/headers/geos/version.h.vc
===================================================================
--- trunk/source/headers/geos/version.h.vc	2007-11-23 02:33:41 UTC (rev 2032)
+++ trunk/source/headers/geos/version.h.vc	2007-11-26 06:16:14 UTC (rev 2033)
@@ -23,6 +23,10 @@
 #ifndef GEOS_VERSION_H
 #define GEOS_VERSION_H
 
+#ifndef _MSC_VER
+#error "This version.h intended for use with MS Visual C++"
+#endif
+
 #define GEOS_VERSION_MAJOR 3
 #define GEOS_VERSION_MINOR 0
 #define GEOS_VERSION_PATCH 0rc4