From f7e29f7f2483dafc1706db19c92e12daf2bebebb Mon Sep 17 00:00:00 2001 From: deuce <> Date: Sun, 12 Sep 2004 12:33:26 +0000 Subject: [PATCH] Need to use !include, not just include --- src/build/Common.bmake | 3 +++ src/build/Common.gmake | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/build/Common.bmake b/src/build/Common.bmake index c425994214..6b3ddc3b56 100644 --- a/src/build/Common.bmake +++ b/src/build/Common.bmake @@ -175,6 +175,9 @@ CIOLIB_SRC = $(SRC_ROOT)$(DIRSEP)conio SMBLIB_SRC = $(SRC_ROOT)$(DIRSEP)smblib UIFC_SRC = $(SRC_ROOT)$(DIRSEP)uifc +# Pull in lib-specific flags +!include $(CIOLIB_SRC)$(DIRSEP)Common.make + .path.c = .;$(XPDEV_SRC);$(SMBLIB_SRC);$(CIOLIB_SRC);$(UIFC_SRC) .path.cpp = .;$(XPDEV_SRC);$(SMBLIB_SRC);$(CIOLIB_SRC);$(UIFC_SRC) diff --git a/src/build/Common.gmake b/src/build/Common.gmake index f052ebbf84..9ae6630978 100644 --- a/src/build/Common.gmake +++ b/src/build/Common.gmake @@ -218,6 +218,9 @@ CIOLIB_SRC := $(SRC_ROOT)$(DIRSEP)conio SMBLIB_SRC := $(SRC_ROOT)$(DIRSEP)smblib UIFC_SRC := $(SRC_ROOT)$(DIRSEP)uifc +# Pull in lib-specific flags +include $(CIOLIB_SRC)$(DIRSEP)Common.make + ifdef DEBUG CFLAGS += -ggdb CFLAGS += -D_DEBUG -- GitLab