Committed, added WIN32_LEAN_AND_MEAN.
On 4/8/08, Douglas E. Engert <[EMAIL PROTECTED]> wrote: > > > Alon Bar-Lev wrote: > > > > 2. libp11, engine_pkcs11 should also be fixed... :) > > 3. The version.rc is constant to all files... While at mingw build I > > provide a better description... > > 4. I will make winconfig.h to be generated with correct sources. > > > > > > See below for for engine_pkcs11. > > 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. > > Index: Makefile.mak > =================================================================== > --- Makefile.mak (revision 0) > +++ Makefile.mak (revision 0) > @@ -0,0 +1,13 @@ > + > +SUBDIRS = src > + > +all:: > + > +all:: config.h > + > +config.h: winconfig.h > + @copy /y winconfig.h config.h > + > +all depend install clean:: > + @for %i in ( $(SUBDIRS) ) do \ > + @cmd /c "cd %i && $(MAKE) /nologo /f Makefile.mak $@" > Index: src/Makefile.mak > =================================================================== > --- src/Makefile.mak (revision 82) > +++ src/Makefile.mak (working copy) > @@ -7,7 +7,7 @@ > LIBP11_INC = /IC:\libp11\include > 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 /DHAVE_OPENSSL > LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86 > > > @@ -21,4 +21,8 @@ > cl $(COPTS) /c $< > > $(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 > Index: src/engine_pkcs11.def > =================================================================== > --- src/engine_pkcs11.def (revision 82) > +++ src/engine_pkcs11.def (working copy) > @@ -1,4 +0,0 @@ > -LIBRARY engine_pkcs11 > -EXPORTS > - v_check > - bind_engine > Index: winconfig.h > =================================================================== > --- winconfig.h (revision 0) > +++ winconfig.h (revision 0) > @@ -0,0 +1 @@ > +/* nothing for now */ > > > > > > Alon. > > > > > > > > -- > > Douglas E. Engert <[EMAIL PROTECTED]> > Argonne National Laboratory > 9700 South Cass Avenue > Argonne, Illinois 60439 > (630) 252-5444 > > Index: Makefile.mak > =================================================================== > --- Makefile.mak (revision 0) > +++ Makefile.mak (revision 0) > @@ -0,0 +1,13 @@ > + > +SUBDIRS = src > + > +all:: > + > +all:: config.h > + > +config.h: winconfig.h > + @copy /y winconfig.h config.h > + > +all depend install clean:: > + @for %i in ( $(SUBDIRS) ) do \ > + @cmd /c "cd %i && $(MAKE) /nologo /f Makefile.mak $@" > Index: src/Makefile.mak > =================================================================== > --- src/Makefile.mak (revision 82) > +++ src/Makefile.mak (working copy) > @@ -7,7 +7,7 @@ > LIBP11_INC = /IC:\libp11\include > 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 /DHAVE_OPENSSL > LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86 > > > @@ -21,4 +21,8 @@ > cl $(COPTS) /c $< > > $(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 > Index: src/engine_pkcs11.def > =================================================================== > --- src/engine_pkcs11.def (revision 82) > +++ src/engine_pkcs11.def (working copy) > @@ -1,4 +0,0 @@ > -LIBRARY engine_pkcs11 > -EXPORTS > - v_check > - bind_engine > Index: winconfig.h > =================================================================== > --- winconfig.h (revision 0) > +++ winconfig.h (revision 0) > @@ -0,0 +1 @@ > +/* nothing for now */ > > _______________________________________________ opensc-devel mailing list [email protected] http://www.opensc-project.org/mailman/listinfo/opensc-devel
