Changeset 2998 for trunk/src

Timestamp:

Mar 4, 2000, 8:17:27 PM (25 years ago)

Author:

bird

Message:

Updated to benefit from the global defenitions in pdwin32.mk.
Using LD2 as link editor.

File:

• trunk/src/kernel32/makefile (modified) (5 diffs)

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.85 2000-03-03 11:15:58 sandervl Exp $
+# $Id: makefile,v 1.86 2000-03-04 19:17:27 bird Exp $
 
 #
@@ -15 +15 @@
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-
 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) 
+CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
 
 !ifdef NODEBUGINFO
@@ -23 +22 @@
 CXXFLAGS = $(CXXFLAGS) -DDEFAULT_LOGGING_OFF
 !endif
-
-!ifdef DEBUGALL
-CFLAGS = $(CFLAGS) -DDEBUG_ENABLELOG_LEVEL2
-CXXFLAGS = $(CXXFLAGS) -DDEBUG_ENABLELOG_LEVEL2
-!endif
-
-RC = $(PDWIN32_TOOLS)\wrc
-RCFLAGS = -s -I. -I$(CPPMAIN)\include -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win
 
 OBJS = KERNEL32.OBJ KOBJECTS.OBJ CONSOLE.OBJ CONIN.OBJ \
@@ -57 +48 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def $(TARGET).lrf
-#   $(LD) $(LDFLAGS) /Fm /Fe$@ /B"/FREE" @$(TARGET).lrf
-!ifdef DEBUG
-!ifdef NODEBUGINFO
-    ilink /nodeb /map /noe /NOD /NoLogo /NOFREE @$(TARGET).lrf
-!else
-    ilink /de /map  /noe /NOD /dbgpack /NoLogo /NOFREE @$(TARGET).lrf
-!endif
-!else
-    ilink /map  /noe /NOD /NoLogo /NOFREE @$(TARGET).lrf
-!endif
+    $(LD2) $(LD2FLAGS) /NOFREE @$(TARGET).lrf
     rc -r console.rc console.res
     rc console.res $@
     $(CP) $@ $(PDWIN32_BIN)
+
+# old linker stuff
+#   $(LD) $(LDFLAGS) /Fm /Fe$@ /B"/FREE" @$(TARGET).lrf
+#!ifdef DEBUG
+#!ifdef NODEBUGINFO
+#    ilink /nodeb /map /noe /NOD /NoLogo /NOFREE @$(TARGET).lrf
+#!else
+#    ilink /de /map  /noe /NOD /dbgpack /NoLogo /NOFREE @$(TARGET).lrf
+#!endif
+#!else
+#    ilink /map  /noe /NOD /NoLogo /NOFREE @$(TARGET).lrf
+#!endif
+
 
 
@@ -104 +99 @@
     $(RC) $(RCFLAGS) -o kernelrsrc.asm kernel32.rc
 
+
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \