win32: link OpenSSL statically again
This commit is contained in:
parent
75d76f5ce4
commit
8a47f238de
|
@ -1,6 +1,6 @@
|
||||||
TOPDIR = ..\..
|
TOPDIR = ..\..
|
||||||
|
|
||||||
COMMON_OBJECTS = compat_getpass.obj compat_getopt.obj compat_strlcpy.obj compat_strlcat.obj simclist.obj
|
COMMON_OBJECTS = compat_getpass.obj compat_getopt.obj compat_strlcpy.obj compat_strlcat.obj simclist.obj compat_report_rangecheckfailure.obj
|
||||||
|
|
||||||
all: common.lib libpkcs11.lib libscdl.lib
|
all: common.lib libpkcs11.lib libscdl.lib
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
#if HAVE_CONFIG_H
|
||||||
|
#include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef HAVE_RANGECHECKFAILURE /* empty file if __report_rangecheckfailure is available */
|
||||||
|
|
||||||
|
// do not fail when linked with /GS dll and when /GS is not available
|
||||||
|
#ifdef _WIN32
|
||||||
|
#if defined(_MSC_VER) && (_MSC_VER < 1700)
|
||||||
|
// only for vs 2012 or later
|
||||||
|
|
||||||
|
#include <Windows.h>
|
||||||
|
|
||||||
|
__declspec(noreturn) void __cdecl __report_rangecheckfailure()
|
||||||
|
{
|
||||||
|
ExitProcess(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
#endif
|
|
@ -37,6 +37,7 @@ pkcs11_spy_la_SOURCES = pkcs11-spy.c pkcs11-display.c pkcs11-display.h pkcs11.ex
|
||||||
pkcs11_spy_la_LIBADD = \
|
pkcs11_spy_la_LIBADD = \
|
||||||
$(top_builddir)/src/common/libpkcs11.la \
|
$(top_builddir)/src/common/libpkcs11.la \
|
||||||
$(top_builddir)/src/common/libscdl.la \
|
$(top_builddir)/src/common/libscdl.la \
|
||||||
|
$(top_builddir)/src/common/libcompat.la \
|
||||||
$(OPTIONAL_OPENSSL_LIBS)
|
$(OPTIONAL_OPENSSL_LIBS)
|
||||||
pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
|
pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
|
||||||
-export-symbols "$(srcdir)/pkcs11.exports" \
|
-export-symbols "$(srcdir)/pkcs11.exports" \
|
||||||
|
|
|
@ -33,5 +33,5 @@ $(TARGET3): $(OBJECTS3) ..\libopensc\opensc.lib
|
||||||
echo LIBRARY $* > $*.def
|
echo LIBRARY $* > $*.def
|
||||||
echo EXPORTS >> $*.def
|
echo EXPORTS >> $*.def
|
||||||
type pkcs11.exports >> $*.def
|
type pkcs11.exports >> $*.def
|
||||||
link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET3) $(OBJECTS3) ..\libopensc\opensc.lib ..\common\libpkcs11.lib ..\common\libscdl.lib $(OPENSSL_LIB) gdi32.lib advapi32.lib
|
link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET3) $(OBJECTS3) ..\libopensc\opensc.lib ..\common\libpkcs11.lib ..\common\libscdl.lib ..\common\common.lib $(OPENSSL_LIB) gdi32.lib advapi32.lib
|
||||||
if EXIST $(TARGET3).manifest mt -manifest $(TARGET3).manifest -outputresource:$(TARGET3);2
|
if EXIST $(TARGET3).manifest mt -manifest $(TARGET3).manifest -outputresource:$(TARGET3);2
|
||||||
|
|
|
@ -33,11 +33,7 @@ OPENSSL_DIR = C:\OpenSSL-Win32
|
||||||
OPENSSL_INCL_DIR = /I$(OPENSSL_DIR)\include
|
OPENSSL_INCL_DIR = /I$(OPENSSL_DIR)\include
|
||||||
|
|
||||||
#define OPENSSL_STATIC if you have visual studio compatible with OpenSSL's static binaries
|
#define OPENSSL_STATIC if you have visual studio compatible with OpenSSL's static binaries
|
||||||
!IF "$(OPENSSL_STATIC)" == "yes, I know what I do"
|
|
||||||
OPENSSL_STATIC_DIR = static
|
OPENSSL_STATIC_DIR = static
|
||||||
!ELSE
|
|
||||||
OPENSSL_EXTRA_CFLAGS = /DOPENSSL_NO_STATIC_ENGINE
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
!IF "$(DEBUG_DEF)" == "/DDEBUG"
|
!IF "$(DEBUG_DEF)" == "/DDEBUG"
|
||||||
OPENSSL_LIB = $(OPENSSL_DIR)\lib\VC\$(OPENSSL_STATIC_DIR)\libeay32MTd.lib user32.lib advapi32.lib crypt32.lib
|
OPENSSL_LIB = $(OPENSSL_DIR)\lib\VC\$(OPENSSL_STATIC_DIR)\libeay32MTd.lib user32.lib advapi32.lib crypt32.lib
|
||||||
|
@ -80,19 +76,19 @@ ALL_INCLUDES = /I$(TOPDIR)\win32 /I$(TOPDIR)\src $(OPENSSL_INCL_DIR) $(OPENSSL_E
|
||||||
!IF "$(DEBUG_DEF)" == "/DDEBUG"
|
!IF "$(DEBUG_DEF)" == "/DDEBUG"
|
||||||
LINKDEBUGFLAGS = /NODEFAULTLIB:LIBCMT /DEBUG
|
LINKDEBUGFLAGS = /NODEFAULTLIB:LIBCMT /DEBUG
|
||||||
CODE_OPTIMIZATION =
|
CODE_OPTIMIZATION =
|
||||||
COPTS = /W3 /D_CRT_SECURE_NO_DEPRECATE /MTd /nologo /DHAVE_CONFIG_H $(ALL_INCLUDES) /D_WIN32_WINNT=0x0502 /DWIN32_LEAN_AND_MEAN $(OPENSSL_DEF) $(ZLIB_DEF) $(MINIDRIVER_DEF) $(SM_DEF) /DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\"" /DDEBUG /Zi /Od
|
COPTS = /GS /W3 /D_CRT_SECURE_NO_DEPRECATE /MTd /nologo /DHAVE_CONFIG_H $(ALL_INCLUDES) /D_WIN32_WINNT=0x0502 /DWIN32_LEAN_AND_MEAN $(OPENSSL_DEF) $(ZLIB_DEF) $(MINIDRIVER_DEF) $(SM_DEF) /DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\"" /DDEBUG /Zi /Od
|
||||||
!ELSE
|
!ELSE
|
||||||
LINKDEBUGFLAGS = /NODEFAULTLIB:LIBCMTD
|
LINKDEBUGFLAGS = /NODEFAULTLIB:LIBCMTD
|
||||||
COPTS = /W3 /D_CRT_SECURE_NO_DEPRECATE /MT /nologo /DHAVE_CONFIG_H $(ALL_INCLUDES) /D_WIN32_WINNT=0x0502 /DWIN32_LEAN_AND_MEAN $(OPENSSL_DEF) $(ZLIB_DEF) $(MINIDRIVER_DEF) $(SM_DEF) /DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\""
|
COPTS = /GS /W3 /D_CRT_SECURE_NO_DEPRECATE /MT /nologo /DHAVE_CONFIG_H $(ALL_INCLUDES) /D_WIN32_WINNT=0x0502 /DWIN32_LEAN_AND_MEAN $(OPENSSL_DEF) $(ZLIB_DEF) $(MINIDRIVER_DEF) $(SM_DEF) /DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\""
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
|
|
||||||
!IF "$(BUILD_FOR)" == "WIN64"
|
!IF "$(BUILD_FOR)" == "WIN64"
|
||||||
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X64 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT $(LINKDEBUGFLAGS)
|
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X64 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT /NXCOMPAT /DYNAMICBASE $(LINKDEBUGFLAGS)
|
||||||
LIBFLAGS = /nologo /machine:x64
|
LIBFLAGS = /nologo /machine:x64
|
||||||
CANDLEFLAGS = -dPlatform=x64 $(CANDLEFLAGS)
|
CANDLEFLAGS = -dPlatform=x64 $(CANDLEFLAGS)
|
||||||
!ELSE
|
!ELSE
|
||||||
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X86 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT $(LINKDEBUGFLAGS)
|
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X86 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT /NXCOMPAT /DYNAMICBASE /SAFESH $(LINKDEBUGFLAGS)
|
||||||
LIBFLAGS = /nologo /machine:x86
|
LIBFLAGS = /nologo /machine:x86
|
||||||
CANDLEFLAGS = -dPlatform=x86 $(CANDLEFLAGS)
|
CANDLEFLAGS = -dPlatform=x86 $(CANDLEFLAGS)
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
|
@ -152,9 +152,6 @@
|
||||||
<File Source="$(var.SOURCE_DIR)\src\tools\iasecc-tool.exe" Vital="yes"/>
|
<File Source="$(var.SOURCE_DIR)\src\tools\iasecc-tool.exe" Vital="yes"/>
|
||||||
</Component>
|
</Component>
|
||||||
<?ifdef OpenSSL ?>
|
<?ifdef OpenSSL ?>
|
||||||
<Component Id="libeay32.dll" Guid="*" Win64="$(var.Win64YesNo)">
|
|
||||||
<File Source="$(var.OpenSSL)\libeay32.dll" Vital="yes"/>
|
|
||||||
</Component>
|
|
||||||
<Component Id="smm_local.dll" Guid="*" Win64="$(var.Win64YesNo)">
|
<Component Id="smm_local.dll" Guid="*" Win64="$(var.Win64YesNo)">
|
||||||
<File Source="$(var.SOURCE_DIR)\src\smm\smm-local.dll" Vital="yes"/>
|
<File Source="$(var.SOURCE_DIR)\src\smm\smm-local.dll" Vital="yes"/>
|
||||||
</Component>
|
</Component>
|
||||||
|
@ -297,7 +294,6 @@
|
||||||
<?endif ?>
|
<?endif ?>
|
||||||
<ComponentRef Id="opensc.conf"/>
|
<ComponentRef Id="opensc.conf"/>
|
||||||
<?ifdef OpenSSL ?>
|
<?ifdef OpenSSL ?>
|
||||||
<ComponentRef Id="libeay32.dll"/>
|
|
||||||
<ComponentRef Id="smm_local.dll"/>
|
<ComponentRef Id="smm_local.dll"/>
|
||||||
<?endif ?>
|
<?endif ?>
|
||||||
</Feature>
|
</Feature>
|
||||||
|
|
Loading…
Reference in New Issue