Changeset 35617 for main

Timestamp:

2021-10-15T17:05:30+13:00 (3 years ago)

Author:

davidb

Message:

Fix to nmake variable tested for VISUAL_STUDIO_VERSION

File:

• main/trunk/greenstone2/common-src/win32.mak (modified) (2 diffs)

main/trunk/greenstone2/common-src/win32.mak

@@ -64 +64 @@
 JDBMEDIT_DIR = src\jdbmedit
 
-MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" BINDIR="$(GSDLHOME)\bin\windows" LIBDIR="$(GSDLHOME)\lib\windows"
+MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" VISUAL_STUDIO_VERSION="$(VISUAL_STUDIO_VERSION)" BINDIR="$(GSDLHOME)\bin\windows" LIBDIR="$(GSDLHOME)\lib\windows"
 
 !IF $(GSDL_VC4)
@@ -142 +142 @@
     cd "$(COMMONHOME)"
     cd indexers\packages\windows\iconv
-    @ set ICONVZIP=iconv-VS14-PLUS.zip  
-    @ if $(VisualStudioVersion) LEQ 14.0 set ICONVZIP=iconv-PRE-VS14.zip    
+    @ set ICONVZIP=iconv-VS14-PLUS.zip
+    @ if $(VISUAL_STUDIO_VERSION) LEQ 14.0 set ICONVZIP=iconv-PRE-VS14.zip  
     if NOT EXIST "iconv" unzip "%ICONVZIP%"
     cd "$(COMMONHOME)"