[geos-commits] r2670 - in trunk: . capi source

[svn_geos at osgeo.org]

Author: warmerdam
Date: 2009-10-13 10:20:29 -0400 (Tue, 13 Oct 2009)
New Revision: 2670

Modified:
   trunk/ChangeLog
   trunk/capi/geos_c.h.in
   trunk/nmake.opt
   trunk/source/Makefile.vc
Log:
fix nmake dll export, and link test programs (#288)

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-08 12:51:45 UTC (rev 2669)
+++ trunk/ChangeLog	2009-10-13 14:20:29 UTC (rev 2670)
@@ -1,3 +1,9 @@
+2009-10-13  Frank Warmerdam  <warmerdam at pobox.com>
+
+	* r[2670] Fix nmake DLL export and test linking (#280)
+
+	* [r2669] Add new directory and source to nmakefiles (#288)
+
 2009-10-08 08:17  Sandro Santilli <strk at keybit.net>
 
 	* [r2663] tests/unit/Makefile.am: Distribute all of TUT

Modified: trunk/capi/geos_c.h.in
===================================================================
--- trunk/capi/geos_c.h.in	2009-10-08 12:51:45 UTC (rev 2669)
+++ trunk/capi/geos_c.h.in	2009-10-13 14:20:29 UTC (rev 2670)
@@ -336,9 +336,9 @@
                                      const GEOSGeometry *g,
                                      const GEOSGeometry *p);
 
-extern GEOSGeometry* GEOS_DLL GEOSInterpolate(const GEOSGeometry *g,
+extern GEOSGeometry GEOS_DLL *GEOSInterpolate(const GEOSGeometry *g,
                                               double d);
-extern GEOSGeometry* GEOS_DLL GEOSInterpolate_r(GEOSContextHandle_t handle,
+extern GEOSGeometry GEOS_DLL *GEOSInterpolate_r(GEOSContextHandle_t handle,
                                                 const GEOSGeometry *g,
                                                 double d);
 
@@ -348,9 +348,9 @@
                                                const GEOSGeometry *g,
                                                const GEOSGeometry *p);
 
-extern GEOSGeometry* GEOS_DLL GEOSInterpolateNormalized(const GEOSGeometry *g,
+extern GEOSGeometry GEOS_DLL *GEOSInterpolateNormalized(const GEOSGeometry *g,
                                                         double d);
-extern GEOSGeometry* GEOS_DLL GEOSInterpolateNormalized_r(
+extern GEOSGeometry GEOS_DLL *GEOSInterpolateNormalized_r(
                                                 GEOSContextHandle_t handle,
                                                 const GEOSGeometry *g,
                                                 double d);

Modified: trunk/nmake.opt
===================================================================
--- trunk/nmake.opt	2009-10-08 12:51:45 UTC (rev 2669)
+++ trunk/nmake.opt	2009-10-13 14:20:29 UTC (rev 2670)
@@ -89,7 +89,7 @@
 ###############################################################################
 # Include directories
 
-GEOS_INCLUDE = -Iheaders
+GEOS_INCLUDE = -Iheaders -I..\capi
 
 !MESSAGE *** Setting GEOS_INCLUDE $(GEOS_INCLUDE)
 !MESSAGE *** Setting INCLUDE $(INCLUDE)

Modified: trunk/source/Makefile.vc
===================================================================
--- trunk/source/Makefile.vc	2009-10-08 12:51:45 UTC (rev 2669)
+++ trunk/source/Makefile.vc	2009-10-13 14:20:29 UTC (rev 2670)
@@ -300,6 +300,12 @@
 
 default: $(LIBNAME) $(DLLNAME) $(CDLLNAME)
 
+all: $(LIBNAME) $(DLLNAME) $(CDLLNAME) TestSweepLineSpeed.exe geostest.exe
+
+check: all
+	TestSweepLineSpeed.exe
+	
+
 $(LIBNAME):	headers/geos/platform.h headers/geos/version.h ../capi/geos_c.h $(OBJ)
 	if exist $(LIBNAME) del $(LIBNAME)
 	$(LINK) /lib /out:$(LIBNAME) $(OBJ)
@@ -326,6 +332,9 @@
 .cpp.obj:
     $(CC) $(CFLAGS) /c $*.cpp /Fo$@
 
+{..\capi}.cpp.obj:
+	$(CC) $(CFLAGS) /D "GEOS_DLL_EXPORT" /c $*.cpp /Fo$@
+
 .c.obj:
 	$(CC) $(CFLAGS) /c $*.c /Fo$@
 
@@ -347,14 +356,14 @@
 	- at FOR %d IN ( $(GEOS_DIRLIST) ) DO del %d\*.obj
 
 TestSweepLineSpeed.exe:	$(LIBNAME) \
-		bigtest\GeometryTestFactory.obj \
-		bigtest\TestSweepLineSpeed.obj
+		..\tests\bigtest\GeometryTestFactory.obj \
+		..\tests\bigtest\TestSweepLineSpeed.obj
 	$(LINK) /debug /out:TestSweepLineSpeed.exe \
-		bigtest\TestSweepLineSpeed.obj \
-		bigtest\GeometryTestFactory.obj \
+		..\tests\bigtest\TestSweepLineSpeed.obj \
+		..\tests\bigtest\GeometryTestFactory.obj \
 		$(LIBNAME)
 
-geostest.exe: $(DLLNAME) ..\capi\geostest.obj
-	$(LINK) /debug ..\capi\geostest.obj $(SLIBNAME)
+geostest.exe: $(CDLLNAME) ..\tests\unit\capi\geostest.obj
+	$(LINK) /debug ..\tests\unit\capi\geostest.obj $(CLIBNAME)
 
 # EOF