[pkg-opensc-commit] [pkcs11-helper] 52/253: Visual Studio Makefile updates

[Eric Dorland]

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

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

commit 621d152477d33de92c8a105f7fc423dcd470122b
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Fri Dec 22 22:03:15 2006 +0000

    Visual Studio Makefile updates
---
 INSTALL             |  8 ++++++--
 lib/Makefile.w32-vc | 13 ++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/INSTALL b/INSTALL
index d60582e..0f516c1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -69,6 +69,10 @@ Visual Studio
 		None.
 
 	Build:
-		cd lib
-		nmake -f Makefile.w32-vc
+		Without openssl engine:
+			cd lib
+			nmake -f Makefile.w32-vc
+		With openssl engine:
+			cd lib
+			nmake -f Makefile.w32-vc OPENSSL=1 OPENSSL_HOME=<location of openssl>
 
diff --git a/lib/Makefile.w32-vc b/lib/Makefile.w32-vc
index 240f27c..ea7838a 100644
--- a/lib/Makefile.w32-vc
+++ b/lib/Makefile.w32-vc
@@ -51,14 +51,13 @@
 
 #
 # If you wish openssl interface
-#
-# Change these to point to your OpenSSL top-level
-# directories.
-# Provide OPENSS=1 as nmake argument.
+# Provide OPENSS=1 OPENSSL_HOME=<location> as nmake argument.
 #
 #OPENSSL=1
 !ifdef OPENSSL
-OPENSSL = ..\..\openssl-0.9.8a
+!ifndef OPENSSL_HOME
+OPENSSL_HOME = ..\..\openssl-0.9.8a
+!endif
 !endif
 
 !ifdef OPENSSL
@@ -67,8 +66,8 @@ OPENSSL_STATIC = libeay32.lib
 OPENSSL_DYNAMIC = libeay32.lib
 #OPENSSL_DYNAMIC = libeay32d.lib
 
-OPENSSL_CFLAGS=-I$(OPENSSL)/inc32 -DENABLE_PKCS11H_OPENSSL
-OPENSSL_LIBS=-LIBPATH:$(OPENSSL)\out32 user32.lib advapi32.lib $(OPENSSL_STATIC)
+OPENSSL_CFLAGS=-I$(OPENSSL_HOME)/inc32 -DENABLE_PKCS11H_OPENSSL
+OPENSSL_LIBS=-LIBPATH:$(OPENSSL_HOME)\out32 user32.lib advapi32.lib $(OPENSSL_STATIC)
 !endif
 
 CFLAGS = -I../include $(OPENSSL_CFLAGS) -DWIN32 -DWIN32_LEAN_AND_MEAN -D_MBCS -D_CRT_SECURE_NO_DEPRECATE

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