diff --git a/src/Makefile.mak b/src/Makefile.mak index af89ed89..07e98364 100644 --- a/src/Makefile.mak +++ b/src/Makefile.mak @@ -2,7 +2,7 @@ TOPDIR = .. !INCLUDE $(TOPDIR)\win32\Make.rules.mak -SUBDIRS = include common scconf scdl libopensc tests pkcs15init pkcs11 tools +SUBDIRS = include common scconf libopensc tests pkcs15init pkcs11 tools all:: diff --git a/src/libp11/Makefile.mak b/src/libp11/Makefile.mak index 851146b4..1b456382 100644 --- a/src/libp11/Makefile.mak +++ b/src/libp11/Makefile.mak @@ -12,6 +12,6 @@ all: install-headers $(TARGET) !INCLUDE $(TOPDIR)\win32\Make.rules.mak -$(TARGET): $(OBJECTS) ..\scdl\scdl.lib +$(TARGET): $(OBJECTS) perl $(TOPDIR)\win32\makedef.pl $*.def $* $(OBJECTS) - link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) $(OBJECTS) ..\pkcs11\libpkcs11.lib ..\scdl\scdl.lib $(OPENSSL_LIB) + link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) $(OBJECTS) ..\pkcs11\libpkcs11.lib ..\scdl\scdl.lib $(OPENSSL_LIB) $(LIBLTDL) diff --git a/src/pkcs11/Makefile.mak b/src/pkcs11/Makefile.mak index fd7cc640..a500a1da 100644 --- a/src/pkcs11/Makefile.mak +++ b/src/pkcs11/Makefile.mak @@ -21,7 +21,7 @@ all: install-headers install-headers-dir $(TARGET) $(TARGET2) $(TARGET3) !INCLUDE $(TOPDIR)\win32\Make.rules.mak $(TARGET): $(OBJECTS) ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib - link $(LINKFLAGS) /dll /out:$(TARGET) $(OBJECTS) ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib winscard.lib ..\scdl\scdl.lib $(OPENSSL_LIB) gdi32.lib + link $(LINKFLAGS) /dll /out:$(TARGET) $(OBJECTS) ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib winscard.lib $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib $(TARGET2): $(OBJECTS2) ..\scdl\scdl.lib lib /nologo /machine:ix86 /out:$(TARGET2) $(OBJECTS2) ..\scdl\scdl.lib diff --git a/src/tools/Makefile.mak b/src/tools/Makefile.mak index d8e9bfc4..d3012601 100644 --- a/src/tools/Makefile.mak +++ b/src/tools/Makefile.mak @@ -16,5 +16,4 @@ all: util.obj $(TARGETS) link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj util.obj \ ..\common\common.lib ..\scconf\scconf.lib ..\libopensc\opensc.lib \ ..\pkcs15init\pkcs15init.lib ..\pkcs11\libpkcs11.lib \ - ..\scdl\scdl.lib \ - $(TOPDIR)\win32\version.res $(OPENSSL_LIB) gdi32.lib + $(TOPDIR)\win32\version.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak index 1a2d9a41..19ed1d96 100644 --- a/win32/Make.rules.mak +++ b/win32/Make.rules.mak @@ -12,6 +12,8 @@ OPENSSL_LIB = C:\openssl\out32dll\libeay32.lib PKCS15_INIT = pkcs15-init.exe !ENDIF +LIBLTDL = # fix me + COPTS = /Zi /MD /nologo /DHAVE_CONFIG_H /I$(TOPDIR)\src\include /I$(TOPDIR)\src\include\opensc $(OPENSSL_INCL_DIR) /D_WIN32_WINNT=0x0400 $(OPENSSL_DEF) LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86