giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use ltdl not scdl. 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2564 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
aj 2005-09-09 14:43:59 +00:00
parent 138a1d7e8c
commit 21e3b71029
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.mak
View File

@ -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::

4
src/libp11/Makefile.mak
View File

@ -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)

2
src/pkcs11/Makefile.mak
View File

@ -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

3
src/tools/Makefile.mak
View File

@ -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

2
win32/Make.rules.mak
View File

@ -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