From 111f9f9c8ec0994debde7a490f41151240b6c162 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Tue, 6 Feb 2024 17:53:06 -0300 Subject: [PATCH] Revert "Attempt fix for Watcom graphics library build issues" This reverts commit dbbb4899b1e9cb233f601e7c4bf47a181b4febf1. --- ac97/Makefile | 1 - acpi/Makefile | 1 - biosdump/Makefile | 1 - clib/watcom.mk | 3 --- isapnp/Makefile | 1 - pcireg/Makefile | 1 - usblgoff/Makefile | 1 - 7 files changed, 9 deletions(-) diff --git a/ac97/Makefile b/ac97/Makefile index 01c2582..9476972 100644 --- a/ac97/Makefile +++ b/ac97/Makefile @@ -17,7 +17,6 @@ SYSTEM = DOS OBJS = ac97.obj clib_pci.obj clib_sys.obj clib_term.obj -LIBS = graph.lib DEST = AC97.EXE !include ../clib/watcom.mk diff --git a/acpi/Makefile b/acpi/Makefile index 0f3e048..9509575 100644 --- a/acpi/Makefile +++ b/acpi/Makefile @@ -17,7 +17,6 @@ SYSTEM = DOS OBJS = acpi.obj clib_pci.obj clib_sys.obj clib_term.obj -LIBS = graph.lib DEST = ACPI.EXE !include ../clib/watcom.mk diff --git a/biosdump/Makefile b/biosdump/Makefile index f459700..d0ddccb 100644 --- a/biosdump/Makefile +++ b/biosdump/Makefile @@ -17,7 +17,6 @@ SYSTEM = PMODEW OBJS = biosdump.obj clib_term.obj -LIBS = graph.lib DEST = BIOSDUMP.EXE !include ../clib/watcom.mk diff --git a/clib/watcom.mk b/clib/watcom.mk index bdad11b..509a22a 100644 --- a/clib/watcom.mk +++ b/clib/watcom.mk @@ -86,9 +86,6 @@ $(DEST): $(OBJS) %write $@.lnk NAME $@ !if "$(SYSTEM)" != "HOST" %write $@.lnk SYSTEM $(SYSTEM) -!endif -!ifdef LIBS - %write $@.lnk LIBRARY $(LIBS) !endif %write $@.lnk FILE {$(OBJS)} $(LINK) $(LDFLAGS) @$@.lnk diff --git a/isapnp/Makefile b/isapnp/Makefile index 6ee7c40..ae36f7f 100644 --- a/isapnp/Makefile +++ b/isapnp/Makefile @@ -17,7 +17,6 @@ SYSTEM = DOS OBJS = isapnp.obj clib_sys.obj clib_term.obj -LIBS = graph.lib DEST = ISAPNP.EXE !include ../clib/watcom.mk diff --git a/pcireg/Makefile b/pcireg/Makefile index 53836ee..a6e6054 100644 --- a/pcireg/Makefile +++ b/pcireg/Makefile @@ -17,7 +17,6 @@ SYSTEM = PMODEW OBJS = pcireg.obj clib_pci.obj clib_std.obj clib_sys.obj clib_term.obj -LIBS = graph.lib DEST = PCIREG.EXE !include ../clib/watcom.mk diff --git a/usblgoff/Makefile b/usblgoff/Makefile index bbeb08b..b636cf7 100644 --- a/usblgoff/Makefile +++ b/usblgoff/Makefile @@ -17,7 +17,6 @@ SYSTEM = PMODEW OBJS = usblgoff.obj clib_pci.obj clib_sys.obj clib_term.obj -LIBS = graph.lib DEST = USBLGOFF.EXE !include ../clib/watcom.mk