Changeset 83

Timestamp:

04/08/08 17:48:19 (4 years ago)

Author:

alonbl

Message:

engine_pkcs11 MSVC fixups

added a Makefile.mak at top to handle the winconfig.h to config.h

update src/Makefile.mak to include /I..\ to get config.h and

use engine_pkcs11.exports for def file
take care of manifest.

removed src/makedef.pl

removed src/engine_pkcs11.def (old version) is created from .exports

added a winconfig.h - so far does not need anything in it.

By Douglas E. Engert

Location:

trunk

Files:

• Makefile.mak (added)
• src/Makefile.mak (modified) (2 diffs)
• src/engine_pkcs11.def (deleted)
• winconfig.h (added)

trunk/src/Makefile.mak

@@ -8 +8 @@
 LIBP11_LIB = C:\libp11\lib\libp11.lib
 
-COPTS = /Zi /MD /nologo /DHAVE_CONFIG_H $(OPENSSL_INC) $(LIBP11_INC) /D_WIN32_WINNT=0x0400 /DHAVE_OPENSSL
+COPTS = /Zi /MD /nologo /I..\ /DHAVE_CONFIG_H $(OPENSSL_INC) $(LIBP11_INC) /D_WIN32_WINNT=0x0400 /DWIN32_LEAN_AND_MEAN /DHAVE_OPENSSL
 LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86
 
@@ -22 +22 @@
 
 $(TARGET): $(OBJECTS) .
+        echo LIBRARY $* > $*.def
+        echo EXPORTS >> $*.def
+        type $*.exports >> $*.def
         link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) $(OBJECTS) $(OPENSSL_LIB) $(LIBP11_LIB) gdi32.lib
+        if EXIST $*.dll.manifest mt -manifest $*.dll.manifest -outputresource:$*.dll;2