Changeset 478

Timestamp:

Aug 11, 1999, 7:16:03 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

Location:

trunk

Files:

• changelog (modified) (1 diff)
• src/makefile (modified) (2 diffs)
• src/user32/new/makefile (modified) (2 diffs)

trunk/changelog

@@ -1 @@
- /* $Id: changelog,v 1.76 1999-08-10 10:01:36 phaller Exp $ */
+ /* $Id: changelog,v 1.77 1999-08-11 17:16:03 sandervl Exp $ */
+ 99-08-10: Sander van Leeuwen <sandervl@xs4all.nl>
+        - USER32/NEW: Fixed makefile (link with odincrt)
+
  99-08-10: Patrick Haller <phaller@gmx.net>
         - LZ32: added preliminary support for independend LZ32 library

trunk/src/makefile

@@ -1 @@
-# $Id: makefile,v 1.5 1999-08-10 12:43:22 phaller Exp $
+# $Id: makefile,v 1.6 1999-08-11 17:15:46 sandervl Exp $
 
 #
@@ -64 +64 @@
         cd ..\ddraw
         $(MAKE_CMD)
+        cd ..\ole32
+        $(MAKE_CMD)
         cd ..\dsound
-        $(MAKE_CMD)
-        cd ..\ole32
         $(MAKE_CMD)
 

trunk/src/user32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.22 1999-07-26 20:03:48 sandervl Exp $
+# $Id: makefile,v 1.23 1999-08-11 17:14:37 sandervl Exp $
 
 #
@@ -40 +40 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def $(TARGET).res
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/gdi32.lib $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/libuls.lib
+        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) sbsstub.obj $(TARGET).def \
+              $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/gdi32.lib $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/libuls.lib \
+              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB
         rc $(TARGET).res $(TARGET).dll
         $(CP) $@ $(PDWIN32_BIN)