Changeset 147

Timestamp:

04/10/08 16:28:55 (4 years ago)

Author:

alonbl

Message:

Fixup MSVC resource build.
By Douglas E. Engert

Location:

trunk

Files:

• Makefile.mak (modified) (1 diff)
• src/Makefile.mak (modified) (1 diff)

trunk/Makefile.mak

@@ -12 +12 @@
          @for %i in ( $(SUBDIRS) ) do \
                 @cmd /c "cd %i && $(MAKE) /nologo /f Makefile.mak $@"
-
-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 $@"
-
-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 $@"

trunk/src/Makefile.mak

@@ -13 +13 @@
         p11_key.obj p11_load.obj p11_misc.obj p11_rsa.obj p11_slot.obj p11_ops.obj
 
-all: $(TARGET)
+all: $(TARGET) versioninfo.res
+
+RSC_PROJ=/l 0x809 /r /fo"versioninfo.res"
+
+versioninfo.res: versioninfo.rc
+        rc $(RSC_PROJ) versioninfo.rc
+ 
 
 .c.obj::
         cl $(COPTS) /c $<
 
-$(TARGET): $(OBJECTS) 
+$(TARGET): $(OBJECTS) versioninfo.res
         echo LIBRARY $* > $*.def
         echo EXPORTS >> $*.def
         type $*.exports >> $*.def
         link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) \
-                $(OBJECTS) $(OPENSSL_LIB) $(LIBLTDL_LIB)
+                $(OBJECTS) $(OPENSSL_LIB) $(LIBLTDL_LIB) versioninfo.res
         if EXIST $*.dll.manifest mt -manifest $*.dll.manifest -outputresource:$*.dll;2