Changeset 4722 for trunk/src/kernel32

Timestamp:

Dec 3, 2000, 1:34:40 AM (25 years ago)

Author:

bird

Message:

New makefile style. (addjustments)
makefile.vac and makefile.smp are obsolete and therefore removed.

---

Location:

trunk/src/kernel32/test

Files:

• makefile (modified) (3 diffs)
• makefile.wat (modified) (2 diffs)

trunk/src/kernel32/test/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 1999-11-28 23:10:08 bird Exp $
+# $Id: makefile,v 1.2 2000-12-03 00:34:40 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       kernel32test.exe makefile
 #
 
-PDWIN32_INCLUDE = ..\..\..\include
-PDWIN32_LIB = ..\..\..\lib
-PDWIN32_BIN = ..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\tools\bin
 
+OLD_STYLE=1
+!include ../../../makefile.inc
 
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
+RC = $(ODIN32_TOOLS)\wrc
+RCFLAGS = -s -I. -I$(CPPMAIN)\include -I$(ODIN32_INCLUDE) -I$(ODIN32_INCLUDE)\win
 
-RC = $(PDWIN32_TOOLS)\wrc
-RCFLAGS = -s -I. -I$(CPPMAIN)\include -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win
-
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE) /Tm+ -Ge+
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) /Tm+ -Ge+
+CFLAGS = $(CFLAGS) -I$(ODIN32_INCLUDE) /Tm+ -Ge+
+CXXFLAGS = $(CXXFLAGS) -I$(ODIN32_INCLUDE) /Tm+ -Ge+
 
 OBJS =  os2main.obj \
@@ -35 +31 @@
 $(TARGET).exe: $(OBJS)
     $(LD) $(LDFLAGS) -Ge+ -Fe$@ $(OBJS) \
-        $(PDWIN32_LIB)\odincrt.lib \
-        $(PDWIN32_LIB)\kernel32.lib \
+        $(ODIN32_LIB)\odincrt.lib \
+        $(ODIN32_LIB)\kernel32.lib \
         OS2386.LIB $(RTLLIB_O)
 
@@ -46 +42 @@
 clean:
     $(RM) *.OBJ $(TARGET).exe rsrc.asm $(TARGET).map *.pch
+

trunk/src/kernel32/test/makefile.wat

@@ -1 @@
-# $Id: makefile.wat,v 1.1 1999-11-28 23:10:08 bird Exp $
+# $Id: makefile.wat,v 1.2 2000-12-03 00:34:40 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       kernel32testw.exe makefile
 #
 
-PDWIN32_INCLUDE = ..\..\..\include
-PDWIN32_LIB = ..\..\..\lib
-PDWIN32_BIN = ..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\tools\bin
+!error "this don't work"
+!include ../../../makefile.inc
 
-
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
-
-INCLUDES = $(WATCOM)\h;$(WATCOM)\h\nt;$(PDWIN32_INCLUDE)
+INCLUDES = $(WATCOM)\h;$(WATCOM)\h\nt;$(ODIN32_INCLUDE)
 
 RC      = $(WATCOM)\binw\wrc.exe
@@ -73 +68 @@
 clean:
     $(RM) *.OBJ $(TARGET).exe rsrc.res $(TARGET).map *.pch
+