Changeset 1118 for trunk/src/win32k

Timestamp:

Oct 4, 1999, 11:56:04 AM (26 years ago)

Author:

sandervl

Message:

Lots of changes by several people (see changelog for 4 October

Location:

trunk/src/win32k

Files:

• Makefile (modified) (7 diffs)
• include/pe2lx.h (modified) (2 diffs)

trunk/src/win32k/Makefile

@@ -1 +1 @@
 ################################################################################
-# $Id: Makefile,v 1.2 1999-09-12 00:26:27 bird Exp $
+# $Id: Makefile,v 1.3 1999-10-04 09:56:03 sandervl Exp $
 #
 # Copyright 1998-1999 knut st. osmundsen
@@ -16 +16 @@
 # COMPILER/LINKER/ASSEMBLER
 ################################################################################
-CC16        = cl
+CC16        = $(MSCPATH)\binp\cl
 CC          = icc
+!if "$(CCENV)" == "VAC36"
+ILIB        = ilib /nofree
+!else
+ILIB        = ilib 
+!endif
 LD          = ilink
 AS          = alp
@@ -72 +77 @@
              -I.                                    \
              -I$(DDKPATH)\h                         \
-             -If:\ddktools\toolkits\msc60\include   \
+             -I$(MSCPATH)\include                   \
+#             -If:\ddktools\toolkits\msc60\include   \
              -I$(PDWIN32_INCLUDE)
 
@@ -134 +140 @@
 # TARGETS
 ################################################################################
-all:$(NAME).sys
+all: ProbKrnl.exe $(NAME).sys
+#all:$(NAME).sys
 
 
@@ -181 +188 @@
 
 
+!if "$(CCENV)" == "VAC36"
+LIBS  = $(VACPATH)\lib\cpprni36.lib         \
+!else
 LIBS  = $(VACPATH)\lib\cppon30.lib          \
+!endif
         $(DDKPATH)\lib\os2286.lib
 
@@ -197 +208 @@
         $(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;
+    $(MSCPATH)\binb\link /NOD /MAP:FULL /CO /pmtype:vio probkrnl.obj, probkrnl.exe, probkrnl.map, $(TOOLKIT)\lib\os2286.lib + $(MSCPATH)\lib\clibcr.lib;
+#    link /NOD /MAP:FULL /CO /pmtype:vio probkrnl.obj, probkrnl.exe, probkrnl.map, f:\toolkit\lib\os2286.lib + $(MSCPATH)\lib\clibcep.lib;
 
 
@@ -218 +230 @@
 devhelp.lib: $(DDKPATH)\lib\dhcalls.lib libconv.exe
     libconv $(DDKPATH)\lib\dhcalls.lib $@
-    ilib /nologo /nobackup /convformat $@;
+    $(ILIB) /nologo /nobackup /convformat $@;
+#   ilib /nologo /nobackup /convformat $@;
 
 clib.lib: $(MSCPATH)\lib\slibcep.lib libconv.exe
     libconv $(MSCPATH)\lib\clibcep.lib $@ > nul
-    ilib /nologo /nobackup /convformat $@;
+    $(ILIB) /nologo /nobackup /convformat $@;
+#   ilib /nologo /nobackup /convformat $@;
 
 last.lib: object\devlast.obj
     -@del $@ > nul 2> nul
-    ilib /nologo /nobackup $@ $**;
+    $(ILIB) /nologo /nobackup $@ $**;
+#   ilib /nologo /nobackup $@ $**;
 
 libconv.exe: libconv.c

trunk/src/win32k/include/pe2lx.h

@@ -1 @@
-/* $Id: pe2lx.h,v 1.1 1999-09-06 02:19:59 bird Exp $
+/* $Id: pe2lx.h,v 1.2 1999-10-04 09:56:04 sandervl Exp $
  *
  * Common header file for pe2lx.
@@ -32 +32 @@
         #include <string.h>
         #include <builtin.h>
-        #if 0
+        #if 1
             #define __malloc_h /* to prevent using the VAC++ malloc.h */
             #include <stdlib.h>