added compatibility with WiX 3.11
This commit is contained in:
parent
0e70c59aef
commit
eb19691efe
|
@ -10,12 +10,24 @@ PROGRAMFILES_PATH = C:\Program Files (x86)
|
||||||
MINIDRIVER_DEF = /DENABLE_MINIDRIVER
|
MINIDRIVER_DEF = /DENABLE_MINIDRIVER
|
||||||
|
|
||||||
#Build MSI with the Windows Installer XML (WIX) toolkit, requires WIX >= 3.9
|
#Build MSI with the Windows Installer XML (WIX) toolkit, requires WIX >= 3.9
|
||||||
WIX_PATH = $(PROGRAMFILES_PATH)\WiX Toolset v3.10
|
!IF "$(WIX)" == ""
|
||||||
WIX_INCL_DIR = "/I$(WIX_PATH)\SDK\VS2010\inc"
|
# at least WiX 3.11 sets the WIX environment variable to its path
|
||||||
|
WIX = $(PROGRAMFILES_PATH)\WiX Toolset v3.10
|
||||||
|
!ENDIF
|
||||||
|
!IF "$(VISUALSTUDIOVERSION)" == "10.0"
|
||||||
|
WIXVSVER = VS2010
|
||||||
|
!ENDIF
|
||||||
|
!IF "$(VISUALSTUDIOVERSION)" == "12.0"
|
||||||
|
WIXVSVER = VS2013
|
||||||
|
!ENDIF
|
||||||
|
!IF "$(VISUALSTUDIOVERSION)" == "14.0"
|
||||||
|
WIXVSVER = VS2015
|
||||||
|
!ENDIF
|
||||||
|
WIX_INCL_DIR = "/I$(WIX)\SDK\$(WIXVSVER)\inc"
|
||||||
!IF "$(BUILD_FOR)" == "WIN64"
|
!IF "$(BUILD_FOR)" == "WIN64"
|
||||||
WIX_LIBS = "$(WIX_PATH)\SDK\VS2010\lib\x64\dutil.lib" "$(WIX_PATH)\SDK\VS2010\lib\x64\wcautil.lib"
|
WIX_LIBS = "$(WIX)\SDK\$(WIXVSVER)\lib\x64\dutil.lib" "$(WIX)\SDK\$(WIXVSVER)\lib\x64\wcautil.lib"
|
||||||
!ELSE
|
!ELSE
|
||||||
WIX_LIBS = "$(WIX_PATH)\SDK\VS2010\lib\x86\dutil.lib" "$(WIX_PATH)\SDK\VS2010\lib\x86\wcautil.lib"
|
WIX_LIBS = "$(WIX)\SDK\$(WIXVSVER)\lib\x86\dutil.lib" "$(WIX)\SDK\$(WIXVSVER)\lib\x86\wcautil.lib"
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
#Include support for Secure Messaging
|
#Include support for Secure Messaging
|
||||||
|
@ -123,6 +135,7 @@ CANDLEFLAGS = -dPlatform=x86 $(CANDLEFLAGS)
|
||||||
cl $(CODE_OPTIMIZATION) $(COPTS) /c $<
|
cl $(CODE_OPTIMIZATION) $(COPTS) /c $<
|
||||||
|
|
||||||
.cpp.obj::
|
.cpp.obj::
|
||||||
|
echo bla $(VISUALSTUDIOVERSION)
|
||||||
cl $(CODE_OPTIMIZATION) $(COPTS) /c $<
|
cl $(CODE_OPTIMIZATION) $(COPTS) /c $<
|
||||||
|
|
||||||
.rc.res::
|
.rc.res::
|
||||||
|
|
|
@ -14,10 +14,10 @@ customactions.dll: versioninfo-customactions.res customactions.obj
|
||||||
link /dll $(LINKFLAGS) /def:$*.def /out:customactions.dll versioninfo-customactions.res customactions.obj msi.lib $(WIX_LIBS) Advapi32.lib User32.lib Version.lib Shell32.lib
|
link /dll $(LINKFLAGS) /def:$*.def /out:customactions.dll versioninfo-customactions.res customactions.obj msi.lib $(WIX_LIBS) Advapi32.lib User32.lib Version.lib Shell32.lib
|
||||||
|
|
||||||
OpenSC.msi: OpenSC.wixobj
|
OpenSC.msi: OpenSC.wixobj
|
||||||
"$(WIX_PATH)\bin\light.exe" -sh -ext WixUIExtension -ext WiXUtilExtension $?
|
"$(WIX)\bin\light.exe" -sh -ext WixUIExtension -ext WiXUtilExtension $?
|
||||||
|
|
||||||
OpenSC.wixobj: OpenSC.wxs customactions.dll
|
OpenSC.wixobj: OpenSC.wxs customactions.dll
|
||||||
"$(WIX_PATH)\bin\candle.exe" -ext WiXUtilExtension -dSOURCE_DIR=$(TOPDIR) $(CANDLEFLAGS) OpenSC.wxs
|
"$(WIX)\bin\candle.exe" -ext WiXUtilExtension -dSOURCE_DIR=$(TOPDIR) $(CANDLEFLAGS) OpenSC.wxs
|
||||||
|
|
||||||
clean::
|
clean::
|
||||||
del /Q config.h *.msi *.wixobj *.wixpdb
|
del /Q config.h *.msi *.wixobj *.wixpdb
|
||||||
|
|
Loading…
Reference in New Issue