Changeset 1319 for trunk/src

Timestamp:

Oct 16, 1999, 1:05:02 PM (26 years ago)

Author:

sandervl

Message:

YD's makefile fix (path)

Location:

trunk/src

Files:

• shell32/makefile (modified) (2 diffs)
• win32k/Makefile (modified) (4 diffs)

trunk/src/shell32/makefile

@@ -1 @@
-# $Id: makefile,v 1.14 1999-10-14 18:28:30 sandervl Exp $
+# $Id: makefile,v 1.15 1999-10-16 11:04:32 sandervl Exp $
 
 #
@@ -21 +21 @@
 
 RC = $(PDWIN32_TOOLS)\wrc
-RCFLAGS = -s -I. -If:\ibmcpp\include -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win
+RCFLAGS = -s -I. -I$(CPPMAIN)\include -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win
 
 TARGET = shell32

trunk/src/win32k/Makefile

@@ -1 +1 @@
 ################################################################################
-# $Id: Makefile,v 1.6 1999-10-14 01:25:37 bird Exp $
+# $Id: Makefile,v 1.7 1999-10-16 11:05:02 sandervl Exp $
 #
 # Copyright 1998-1999 knut st. osmundsen
@@ -21 +21 @@
 ILIB        = ilib /nofree
 !else
-ILIB        = ilib
+ILIB        = ilib3
 !endif
 LD          = ilink
@@ -140 +140 @@
 # TARGETS
 ################################################################################
-all: ProbKrnl.exe $(NAME).sys
+all: $(NAME).sys ProbKrnl.exe
 #all:$(NAME).sys
 
@@ -211 +211 @@
         $(CDEFINES16) -DDEBUGR3 -Fa$(WIN32KLIST)\$(*B).s     \
         -Foprobkrnl.obj $(CINCLUDES16) dev16\probkrnl.c
-    link /NOD /MAP:FULL /CO /pmtype:vio probkrnl.obj, probkrnl.exe, probkrnl.map, f:\toolkit\lib\os2286.lib + $(MSCPATH)\lib\clibcep.lib;
+    link /NOD /MAP:FULL /CO /pmtype:vio probkrnl.obj, probkrnl.exe, probkrnl.map, $(TOOLKIT)\lib\os2286.lib + $(MSCPATH)\lib\clibcep.lib;
 #     $(MSCPATH)\binb\link /NOD /MAP:FULL /CO /pmtype:vio probkrnl.obj, probkrnl.exe, probkrnl.map, $(TOOLKIT)\lib\os2286.lib + $(MSCPATH)\lib\clibcr.lib;