Changeset 6843 for branches

Timestamp:

Sep 27, 2001, 5:27:18 AM (24 years ago)

Author:

bird

Message:

LASTLIB not LASTOBJ.

File:

• branches/splittup/src/win32k/win32k.mak (modified) (6 diffs)

branches/splittup/src/win32k/win32k.mak

@@ -1 @@
-# $Id: win32k.mak,v 1.13.2.1 2001-09-27 03:08:08 bird Exp $
+# $Id: win32k.mak,v 1.13.2.2 2001-09-27 03:27:18 bird Exp $
 
 #
@@ -77 +77 @@
     $(WIN32KOBJ)\devlast.obj
 
+LASTLIB = $(WIN32KOBJ)\lastlib.lib
+
 LIBS =\
+    $(ODIN32_LIB)\kKrnlLib.lib \
     $(VACPATH)\lib\$(RTLLIB_NRE) \
     $(DDKPATH)\lib\os2386.lib \
     $(WIN32KOBJ)\devhelp.lib \
-    $(WIN32KOBJ)\clib.lib \
-    $(ODIN32_LIB)\kKrnlLib.lib
+    $(WIN32KOBJ)\clib.lib
 
 
@@ -97 +99 @@
                             $(LIBS) \
                             $(WIN32KOBJ)\$(NAME)bldlevel.def \
-                            $(LASTOBJ) \
+                            $(LASTLIB) \
                             $(LIBSINIT) \
                             $(WIN32KOBJ)\$(@B).lnk \
@@ -106 +108 @@
     -@$(ECHO) linking: $@
 !ifdef GREP
-    -4 $(LD) $(LFLAGS) @$(WIN32KOBJ)\$(@B).lnk | $(GREP) -v LNK4001 | $(GREP) -v LNK4031
+    -4 $(LD) /FORCE $(LFLAGS) @$(WIN32KOBJ)\$(@B).lnk | $(GREP) -v LNK4001 | $(GREP) -v LNK4031
 !else
     -4 $(LD) $(LFLAGS) @$(WIN32KOBJ)\$(@B).lnk
@@ -128 +130 @@
 $(LIBS:  =^
 )
-$(LASTOBJ)
+$(LASTLIB)
 $(WIN32KOBJ)\$(NAME)bldlevel.def
 <<KEEP
@@ -138 +140 @@
         -V"#define=ODIN32_VERSION,$(ODIN32_INCLUDE)\odinbuild.h" \
         -M"#define=ODIN32_BUILD_NR,$(ODIN32_INCLUDE)\odinbuild.h"
+
+# Last lib - needed to get LASTOBJ in after the importlibraries.
+$(LASTLIB): $(LASTOBJ)
+    -@$(RM) $@ > nul 2> nul
+    $(ILIB) $@ $**;