Changeset 144

Timestamp:

04/08/08 17:42:44 (4 years ago)

Author:

alonbl

Message:

libp11 MSVC fixups

Here they are. This email has libp11 changes. The next email will have

the engine_pkcs11.

The changes are inline as you asked. Watch out for wrapped lines and
spacing. (I attached the changes too, just in case.)

added top Makefile.mak to handle winconfig.h

updated src/Makefile.mak to include config.h and use libp11.exports

take care of manifest.

remove makedef.pl

added winconfig.h with nothing in it for now.

By Douglas E. Engert

Location:

trunk

Files:

• Makefile.mak (added)
• src/Makefile.mak (modified) (2 diffs)
• src/makedef.pl (deleted)
• winconfig.h (added)

trunk/src/Makefile.mak

@@ -5 +5 @@
 OPENSSL_LIB = C:\openssl\out32dll\libeay32.lib
 
-COPTS = /Zi /MD /nologo /I. $(OPENSSL_INC) $(LIBLTDL_INC) /D_WIN32_WINNT=0x0400 /DWIN32
+COPTS = /Zi /MD /nologo /I..\ /I. $(OPENSSL_INC) $(LIBLTDL_INC) /D_WIN32_WINNT=0x0400 /DWIN32 /DWIN32_LEAN_AND_MEAN
 LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86
 
@@ -19 +19 @@
 
 $(TARGET): $(OBJECTS) 
-        perl makedef.pl $*.def $* $(OBJECTS)
+        echo LIBRARY $* > $*.def
+        echo EXPORTS >> $*.def
+        type $*.exports >> $*.def
         link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) \
                 $(OBJECTS) $(OPENSSL_LIB) $(LIBLTDL_LIB)
+        if EXIST $*.dll.manifest mt -manifest $*.dll.manifest -outputresource:$*.dll;2
+