[geos-commits] r4056 - branches/3.4

[svn_geos at osgeo.org]

Author: mloskot
Date: 2015-05-18 02:47:24 -0700 (Mon, 18 May 2015)
New Revision: 4056

Modified:
   branches/3.4/NEWS
   branches/3.4/nmake.opt
Log:
Fixed build configuration for NMAKE with Visual Leak Detector enabled (#715)

Modified: branches/3.4/NEWS
===================================================================
--- branches/3.4/NEWS	2015-04-30 18:52:52 UTC (rev 4055)
+++ branches/3.4/NEWS	2015-05-18 09:47:24 UTC (rev 4056)
@@ -3,6 +3,7 @@
 
 - Bug fixes / improvements
  - Improve robustness of intersection testing (#716)
+ - Fixed build configuration for NMAKE with Visual Leak Detector enabled (#715)
  - Fixed compilation against thread-safe PHP (#541)
  - Fix Empty to Empty equals (#703)
  - Fix build on OpenBSD (#700)

Modified: branches/3.4/nmake.opt
===================================================================
--- branches/3.4/nmake.opt	2015-04-30 18:52:52 UTC (rev 4055)
+++ branches/3.4/nmake.opt	2015-05-18 09:47:24 UTC (rev 4056)
@@ -143,10 +143,9 @@
 ###############################################################################
 # Optional use of Visual Leak Detector (VLD) http://vld.codeplex.com/
 # Uncomment this line to use VLD in debug configuration only:
+#MSVC_VLD_DIR=$(EXTLIBDIR)\Source\vld\vld
+
 !IF "$(BUILD_DEBUG)" == "YES"
-MSVC_VLD_DIR=$(EXTLIBDIR)\Source\vld\vld
-!ENDIF
-
 !IFDEF MSVC_VLD_DIR
 MSVC_VLD_FLAGS=-DMSVC_USE_VLD=1 -I$(MSVC_VLD_DIR)\include
 !IFDEF WIN64
@@ -155,6 +154,7 @@
 MSVC_VLD_LIB=/LIBPATH:$(MSVC_VLD_DIR)/lib/Win32
 !ENDIF
 !ENDIF
+!ENDIF
 
 ###############################################################################
 # Include directories