[geos-commits] r2190 - trunk/source

[svn_geos at osgeo.org]

Author: mloskot
Date: 2008-09-21 17:32:01 -0400 (Sun, 21 Sep 2008)
New Revision: 2190

Modified:
   trunk/source/Makefile.vc
Log:
Patched NMAKE makefiles: replaced lib.exe with link.exe /lib command to enabled compilation using Microsoft Visual C++ Toolkit 2003

Modified: trunk/source/Makefile.vc
===================================================================
--- trunk/source/Makefile.vc	2008-09-16 21:09:14 UTC (rev 2189)
+++ trunk/source/Makefile.vc	2008-09-21 21:32:01 UTC (rev 2190)
@@ -15,6 +15,8 @@
 # Commands
 #
 MAKE = nmake
+CC = cl.exe
+LINK = link.exe
 RM = -del
 
 # Check compiler version given in command line
@@ -46,11 +48,11 @@
 !ENDIF
 
 # Names of binary files
-LIBNAME =	geos.lib
-DLLNAME = 	geos.dll
-CDLLNAME =  geos_c.dll
-CLIBNAME =  geos_c_i.lib
-SLIBNAME =	geos_i.lib
+LIBNAME = geos.lib
+DLLNAME = geos.dll
+CDLLNAME = geos_c.dll
+CLIBNAME = geos_c_i.lib
+SLIBNAME = geos_i.lib
 
 # List of objects
 OBJ = \
@@ -298,7 +300,7 @@
 
 $(LIBNAME):	headers/geos/platform.h headers/geos/version.h ../capi/geos_c.h $(OBJ)
 	if exist $(LIBNAME) del $(LIBNAME)
-	lib /out:$(LIBNAME) $(OBJ)
+	$(LINK) /lib /out:$(LIBNAME) $(OBJ)
 
 $(DLLNAME):	$(OBJ)
 	link /dll /debug $(OBJ) /out:$(DLLNAME) /implib:$(SLIBNAME)