Changeset 2252

Timestamp:

Dec 29, 1999, 7:49:02 PM (25 years ago)

Author:

sandervl

Message:

Added version resources

Location:

trunk/src/msvcrt

Files:

• initterm.cpp (modified) (3 diffs)
• makefile (modified) (7 diffs)
• msvcrt.rc (added)
• msvcrt20.rc (added)
• msvcrt40.rc (added)

trunk/src/msvcrt/initterm.cpp ¶

@@ -1 @@
-/* $Id: initterm.cpp,v 1.1 1999-09-28 13:26:06 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.2 1999-12-29 18:49:01 sandervl Exp $ */
 
 /*
@@ -39 +39 @@
 void CDECL _ctordtorInit( void );
 void CDECL _ctordtorTerm( void );
+
+ //Win32 resource table (produced by wrc)
+ extern DWORD _Resource_PEResTab;
 }
 
@@ -81 +84 @@
          /*******************************************************************/
 
-         if(RegisterLxDll(hModule, 0, 0) == FALSE) 
+         if(RegisterLxDll(hModule, 0, (PVOID)&_Resource_PEResTab) == FALSE) 
                 return 0UL;
 

trunk/src/msvcrt/makefile ¶

@@ -1 @@
-# $Id: makefile,v 1.8 1999-12-21 20:42:27 sandervl Exp $
+# $Id: makefile,v 1.9 1999-12-29 18:49:01 sandervl Exp $
 
 #
@@ -19 +19 @@
 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
 
+RC = $(PDWIN32_TOOLS)\wrc
+RCFLAGS = -s -I. -I$(CPPMAIN)\include -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win
 
 TARGET = msvcrt
@@ -24 +26 @@
 TARGET40 = msvcrt40
 
-OBJS =  msvcrt.obj initterm.obj
+OBJS   =  msvcrt.obj initterm.obj resource.obj
+OBJS20 =  msvcrt.obj initterm.obj resource20.obj
+OBJS40 =  msvcrt.obj initterm.obj resource40.obj
 
 all: $(TARGET).dll $(TARGET).lib $(TARGET20).dll $(TARGET20).lib \
@@ -37 +41 @@
         $(CP) $@ $(PDWIN32_BIN)
 
-$(TARGET20).dll: $(OBJS) $(TARGET20).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET20).def \
+$(TARGET20).dll: $(OBJS20) $(TARGET20).def
+        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS20) $(TARGET20).def \
               $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
               $(PDWIN32_LIB)/crtdll.lib \
@@ -44 +48 @@
         $(CP) $@ $(PDWIN32_BIN)
 
-$(TARGET40).dll: $(OBJS) $(TARGET40).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET40).def \
+$(TARGET40).dll: $(OBJS40) $(TARGET40).def
+        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS40) $(TARGET40).def \
               $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
               $(PDWIN32_LIB)/crtdll.lib \
@@ -64 +68 @@
         $(CP) $@ $(PDWIN32_LIB)
 
+resource.asm: msvcrt.rc
+    $(RC) $(RCFLAGS) -o resource.asm msvcrt.rc
+
+resource.obj: resource.asm
+
+resource20.asm: msvcrt20.rc
+    $(RC) $(RCFLAGS) -o resource20.asm msvcrt20.rc
+
+resource20.obj: resource20.asm
+
+resource40.asm: msvcrt40.rc
+    $(RC) $(RCFLAGS) -o resource40.asm msvcrt40.rc
+
+resource40.obj: resource40.asm
 
 initterm.obj: initterm.cpp
@@ -69 +87 @@
 
 clean:
-        $(RM) *.obj *.lib *.dll *.map *.pch
+        $(RM) *.obj *.lib *.dll *.map *.pch resource*.asm
         $(RM) $(PDWIN32_BIN)\$(TARGET).dll
         $(RM) $(PDWIN32_LIB)\$(TARGET).lib