Changeset 35610


Ignore:
Timestamp:
2021-10-15T13:41:15+13:00 (3 years ago)
Author:
davidb
Message:

Need to pass in environment variable VisualStudioVersion into make files (done as VISUAL_STUDIO_VERSION to be consistent with other veriables, such as GSDL_HOME etc)

Location:
main/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r35597 r35610  
    142142    cd "$(COMMONHOME)"
    143143    cd indexers\packages\windows\iconv
    144     set ICONVZIP=iconv-VS14-PLUS.zip   
    145     if %VisualStudioVersion% LEQ 14.0 set ICONVZIP=iconv-PRE-VS14.zip   
     144    @ set ICONVZIP=iconv-VS14-PLUS.zip 
     145    @ if $(VisualStudioVersion) LEQ 14.0 set ICONVZIP=iconv-PRE-VS14.zip   
    146146    if NOT EXIST "iconv" unzip "%ICONVZIP%"
    147147    cd "$(COMMONHOME)"

  • main/trunk/gs2build/win32.mak

    r21436 r35610  
    5454
    5555
    56 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
     56MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" VISUAL_STUDIO_VERSION="$(VISUAL_STUDIO_VERSION)"
    5757
    5858!IF $(GSDL_VC4)
Note: See TracChangeset for help on using the changeset viewer.