[pkg-opensc-commit] [engine-pkcs11] 15/152: fix windows compile.

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository engine-pkcs11.

commit e99a26c513c8aa557e02ba4e6b8a05ed9d5735a1
Author: Andreas Jellinghaus <andreas at ionisiert.de>
Date:   Tue Sep 20 13:00:49 2005 +0000

    fix windows compile.
---
 src/Makefile.mak | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Makefile.mak b/src/Makefile.mak
index e5edb7c..48eb7bf 100644
--- a/src/Makefile.mak
+++ b/src/Makefile.mak
@@ -2,10 +2,12 @@
 # - set the OPENSSL_LIB below to your openssl lib file
 # Note: these instructions obsolete the instructions in opensc.html
 
-OPENSSL_INCL_DIR = /IC:\openssl\include
-OPENSSL_LIB = C:\openssl\out32dll\libeay32.lib
+OPENSSL_INC = /IC:\openssl\include
+OPENSSL_LIB = C:\openssl\lib\libeay32.lib
+LIBP11_INC = /IC:\libp11\include
+LIBP11_LIB = C:\libp11\lib\libp11.lib
 
-COPTS = /Zi /MD /nologo /DHAVE_CONFIG_H $(OPENSSL_INCL_DIR) /D_WIN32_WINNT=0x0400 /DHAVE_OPENSSL
+COPTS = /Zi /MD /nologo /DHAVE_CONFIG_H $(OPENSSL_INC) $(LIBP11_INC) /D_WIN32_WINNT=0x0400 /DHAVE_OPENSSL
 LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86
 
 
@@ -18,5 +20,5 @@ all: $(TARGET)
 .c.obj::
 	cl $(COPTS) /c $<
 
-$(TARGET): $(OBJECTS) ..\libp11\libp11.lib ..\scconf\scconf.lib
-	link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) $(OBJECTS) ..\libp11\libp11.lib ..\scconf\scconf.lib winscard.lib $(OPENSSL_LIB) gdi32.lib
+$(TARGET): $(OBJECTS) .
+	link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) $(OBJECTS) $(OPENSSL_LIB) $(LIBP11_LIB) gdi32.lib

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/engine-pkcs11.git