WindowsInstaller: Correct support for x64 builds
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5327 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
771aeb32af
commit
639ca655b6
@ -57,9 +57,11 @@ COPTS = /W3 /D_CRT_SECURE_NO_DEPRECATE /MT /nologo /DHAVE_CONFIG_H $(ALL_INCLUD
|
|||||||
!IF "$(BUILD_FOR)" == "WIN64"
|
!IF "$(BUILD_FOR)" == "WIN64"
|
||||||
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X64 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMTD
|
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X64 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMTD
|
||||||
LIBFLAGS = /nologo /machine:x64
|
LIBFLAGS = /nologo /machine:x64
|
||||||
|
CANDLEFLAGS = -dPlatform=x64
|
||||||
!ELSE
|
!ELSE
|
||||||
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X86 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMTD
|
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X86 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMTD
|
||||||
LIBFLAGS = /nologo /machine:x86
|
LIBFLAGS = /nologo /machine:x86
|
||||||
|
CANDLEFLAGS = -dPlatform=x86
|
||||||
!ENDIF
|
!ENDIF
|
||||||
.c.obj::
|
.c.obj::
|
||||||
cl $(COPTS) /c $<
|
cl $(COPTS) /c $<
|
||||||
|
@ -11,7 +11,7 @@ OpenSC.msi: OpenSC.wixobj
|
|||||||
$(WIX_PATH)\bin\light.exe -sh -ext WixUIExtension -ext WiXUtilExtension $?
|
$(WIX_PATH)\bin\light.exe -sh -ext WixUIExtension -ext WiXUtilExtension $?
|
||||||
|
|
||||||
OpenSC.wixobj: OpenSC.wxs
|
OpenSC.wixobj: OpenSC.wxs
|
||||||
$(WIX_PATH)\bin\candle.exe -ext WiXUtilExtension -dSOURCE_DIR=$(TOPDIR) $?
|
$(WIX_PATH)\bin\candle.exe -ext WiXUtilExtension -dSOURCE_DIR=$(TOPDIR) $(CANDLEFLAGS) $?
|
||||||
|
|
||||||
clean::
|
clean::
|
||||||
del /Q config.h *.msi *.wixobj *.wixpdb
|
del /Q config.h *.msi *.wixobj *.wixpdb
|
||||||
|
Loading…
Reference in New Issue
Block a user