[geos-commits] r2968 - trunk

[svn_geos at osgeo.org]

Author: mloskot
Date: 2010-04-07 09:24:09 -0400 (Wed, 07 Apr 2010)
New Revision: 2968

Modified:
   trunk/nmake.opt
Log:
Added ENABLE_INLINE=YES|NO option to nmake.opt for Visual C++ builds using NMake. The ENABLE_INLINE=YES does not link for me - to be fixed

Modified: trunk/nmake.opt
===================================================================
--- trunk/nmake.opt	2010-04-07 13:22:56 UTC (rev 2967)
+++ trunk/nmake.opt	2010-04-07 13:24:09 UTC (rev 2968)
@@ -28,6 +28,16 @@
 !MESSAGE *** Setting BUILD_DEBUG $(BUILD_DEBUG)
 
 ###############################################################################
+# Set ENABLE_INLINE to YES if you want to make debug build
+# and to prepare not optimized binaries.
+
+!IFNDEF ENABLE_INLINE
+ENABLE_INLINE = NO
+!ENDIF
+
+!MESSAGE *** Setting ENABLE_INLINE $(ENABLE_INLINE)
+
+###############################################################################
 # Set BUILD_BATCH to YES if you want feed compiler with all
 # source .c and .cpp files in single batch.
 
@@ -106,7 +116,7 @@
 !IF "$(BUILD_DEBUG)" == "YES"
 BUILD_PREFIX=_d
 GEOS_CFLAGS = /nologo /MDd /GR /Od /W4 /Zi
-GEOS_CPPFLAGS = /D "NDEBUG" $(GEOS_CPPFLAGS)
+GEOS_CPPFLAGS = /D "DEBUG" /D "_DEBUG" $(GEOS_CPPFLAGS)
 !ELSE
 GEOS_CFLAGS = /nologo /MD /GR /O2 /W3
 GEOS_CPPFLAGS = /D "NDEBUG" $(GEOS_CPPFLAGS)
@@ -128,6 +138,10 @@
 !ENDIF
 !ENDIF
 
+!IF "$(ENABLE_INLINE)" == "YES"
+GEOS_CFLAGS = /D "GEOS_INLINE"
+!ENDIF
+
 !MESSAGE *** Using CFLAGS $(GEOS_CFLAGS)
 !MESSAGE *** Using CPPFLAGS $(GEOS_CPPFLAGS)