removed BUILD_ON/BUILD_FOR variable
- guess the system architecture based on %PROCESSOR_ARCHITECTURE% - guess the target system based on %PLATFORM%
This commit is contained in:
parent
eb19691efe
commit
2536365d79
@ -36,15 +36,11 @@ install:
|
||||
- ps: >-
|
||||
If ($env:Platform -Match "x86") {
|
||||
$env:VCVARS_PLATFORM="x86"
|
||||
$env:ENV_PLATFORM="x86"
|
||||
$env:OPENSSL_PF="Win32"
|
||||
$env:NMAKE_ARCH=""
|
||||
$env:ARTIFACT="OpenSC-win32_vs${env:VSVER}-${env:CONFIGURATION}.msi"
|
||||
} Else {
|
||||
$env:VCVARS_PLATFORM="amd64"
|
||||
$env:ENV_PLATFORM="x64"
|
||||
$env:OPENSSL_PF="Win64"
|
||||
$env:NMAKE_ARCH="BUILD_ON=WIN64 BUILD_FOR=WIN64"
|
||||
$env:ARTIFACT="OpenSC-win64_vs${env:VSVER}-${env:CONFIGURATION}.msi"
|
||||
}
|
||||
- ps: >-
|
||||
@ -101,8 +97,8 @@ build_script:
|
||||
- bash -c "exec 0</dev/null && ./configure --disable-openssl --disable-readline --disable-zlib || cat config.log"
|
||||
- bash -c "make -C etc opensc.conf"
|
||||
- cp win32/winconfig.h config.h
|
||||
- nmake /f Makefile.mak %NMAKE_ARCH% %NMAKE_EXTRA%
|
||||
- cd win32 && nmake /f Makefile.mak %NMAKE_ARCH% %NMAKE_EXTRA% VSVER=%VSVER% OpenSC.msi
|
||||
- nmake /f Makefile.mak %NMAKE_EXTRA%
|
||||
- cd win32 && nmake /f Makefile.mak %NMAKE_EXTRA% VSVER=%VSVER% OpenSC.msi
|
||||
- move OpenSC.msi %ARTIFACT%
|
||||
- appveyor PushArtifact %ARTIFACT%
|
||||
# put all pdb files for dump analysis, but this consumes approx 100 MB per build
|
||||
|
@ -1,20 +1,14 @@
|
||||
OPENSC_FEATURES = pcsc
|
||||
|
||||
!IF "$(BUILD_ON)" == "WIN32"
|
||||
PROGRAMFILES_PATH = C:\Program Files
|
||||
!ELSE
|
||||
PROGRAMFILES_PATH = C:\Program Files (x86)
|
||||
!ENDIF
|
||||
|
||||
#Include support for minidriver
|
||||
MINIDRIVER_DEF = /DENABLE_MINIDRIVER
|
||||
|
||||
#Build MSI with the Windows Installer XML (WIX) toolkit, requires WIX >= 3.9
|
||||
!IF "$(WIX)" == ""
|
||||
# at least WiX 3.11 sets the WIX environment variable to its path
|
||||
WIX = $(PROGRAMFILES_PATH)\WiX Toolset v3.10
|
||||
WIX = C:\Program Files\WiX Toolset v3.10
|
||||
!ENDIF
|
||||
!IF "$(VISUALSTUDIOVERSION)" == "10.0"
|
||||
!IF "$(DEVENVDIR)" == "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\" || "$(DEVENVDIR)" == "C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE\"
|
||||
WIXVSVER = VS2010
|
||||
!ENDIF
|
||||
!IF "$(VISUALSTUDIOVERSION)" == "12.0"
|
||||
@ -24,11 +18,7 @@ WIXVSVER = VS2013
|
||||
WIXVSVER = VS2015
|
||||
!ENDIF
|
||||
WIX_INCL_DIR = "/I$(WIX)\SDK\$(WIXVSVER)\inc"
|
||||
!IF "$(BUILD_FOR)" == "WIN64"
|
||||
WIX_LIBS = "$(WIX)\SDK\$(WIXVSVER)\lib\x64\dutil.lib" "$(WIX)\SDK\$(WIXVSVER)\lib\x64\wcautil.lib"
|
||||
!ELSE
|
||||
WIX_LIBS = "$(WIX)\SDK\$(WIXVSVER)\lib\x86\dutil.lib" "$(WIX)\SDK\$(WIXVSVER)\lib\x86\wcautil.lib"
|
||||
!ENDIF
|
||||
WIX_LIBS = "$(WIX)\SDK\$(WIXVSVER)\lib\$(PLATFORM)\dutil.lib" "$(WIX)\SDK\$(WIXVSVER)\lib\$(PLATFORM)\wcautil.lib"
|
||||
|
||||
#Include support for Secure Messaging
|
||||
SM_DEF = /DENABLE_SM
|
||||
@ -43,10 +33,10 @@ SM_DEF = /DENABLE_SM
|
||||
# - set the OPENSSL_LIB below to your openssl lib file
|
||||
#OPENSSL_DEF= /DENABLE_OPENSSL
|
||||
!IF "$(OPENSSL_DEF)" == "/DENABLE_OPENSSL"
|
||||
!IF "$(BUILD_FOR)" == "WIN64"
|
||||
OPENSSL_DIR = C:\OpenSSL-Win64
|
||||
!ELSE
|
||||
!IF "$(PLATFORM)" == "x86"
|
||||
OPENSSL_DIR = C:\OpenSSL-Win32
|
||||
!ELSE
|
||||
OPENSSL_DIR = C:\OpenSSL-Win64
|
||||
!ENDIF
|
||||
OPENSSL_INCL_DIR = /I$(OPENSSL_DIR)\include
|
||||
|
||||
@ -100,7 +90,10 @@ CANDLEFLAGS = -dOpenPACE="$(OPENPACE_DIR)" $(CANDLEFLAGS)
|
||||
|
||||
|
||||
# Used for MiniDriver
|
||||
CNGSDK_INCL_DIR = "/I$(PROGRAMFILES_PATH)\Microsoft CNG Development Kit\Include"
|
||||
CNGSDK_INCL_DIR = "/IC:\Program Files (x86)\Microsoft CNG Development Kit\Include"
|
||||
!IF "$(PROCESSOR_ARCHITECTURE)" == "x86" && "$(PROCESSOR_ARCHITEW6432)" == ""
|
||||
CNGSDK_INCL_DIR = "/IC:\Program Files\Microsoft CNG Development Kit\Include"
|
||||
!ENDIF
|
||||
# Mandatory path to 'ISO C9x compliant stdint.h and inttypes.h for Microsoft Visual Studio'
|
||||
# http://msinttypes.googlecode.com/files/msinttypes-r26.zip
|
||||
# INTTYPES_INCL_DIR = /IC:\opensc\dependencies\msys\local
|
||||
@ -121,21 +114,18 @@ COPTS = /GS /W3 /D_CRT_SECURE_NO_DEPRECATE /MT /nologo /DHAVE_CONFIG_H $(ALL_IN
|
||||
!ENDIF
|
||||
|
||||
|
||||
!IF "$(BUILD_FOR)" == "WIN64"
|
||||
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X64 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT /NXCOMPAT /DYNAMICBASE $(LINKDEBUGFLAGS)
|
||||
LIBFLAGS = /nologo /machine:x64
|
||||
CANDLEFLAGS = -dPlatform=x64 $(CANDLEFLAGS)
|
||||
!ELSE
|
||||
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X86 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT /NXCOMPAT /DYNAMICBASE /SAFESH $(LINKDEBUGFLAGS)
|
||||
LIBFLAGS = /nologo /machine:x86
|
||||
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:$(PLATFORM) /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT /NXCOMPAT /DYNAMICBASE $(LINKDEBUGFLAGS)
|
||||
LIBFLAGS = /nologo /machine:$(PLATFORM)
|
||||
!IF "$(PLATFORM)" == "x86"
|
||||
CANDLEFLAGS = -dPlatform=x86 $(CANDLEFLAGS)
|
||||
!ELSE
|
||||
CANDLEFLAGS = -dPlatform=x64 $(CANDLEFLAGS)
|
||||
!ENDIF
|
||||
|
||||
.c.obj::
|
||||
cl $(CODE_OPTIMIZATION) $(COPTS) /c $<
|
||||
|
||||
.cpp.obj::
|
||||
echo bla $(VISUALSTUDIOVERSION)
|
||||
cl $(CODE_OPTIMIZATION) $(COPTS) /c $<
|
||||
|
||||
.rc.res::
|
||||
|
Loading…
Reference in New Issue
Block a user