From 8751fbc9bb8dbc61d43228e8f285142b9b1a2e30 Mon Sep 17 00:00:00 2001 From: deuce <> Date: Wed, 26 Oct 2011 08:19:34 +0000 Subject: [PATCH] Add Common.make and update Common.gmake to allow inclusion for libsbbs dependencies. --- src/sbbs3/Common.gmake | 18 ++++++++++-------- src/sbbs3/Common.make | 3 +++ 2 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 src/sbbs3/Common.make diff --git a/src/sbbs3/Common.gmake b/src/sbbs3/Common.gmake index 92ad4534d9..8ffb5164cc 100644 --- a/src/sbbs3/Common.gmake +++ b/src/sbbs3/Common.gmake @@ -4,14 +4,16 @@ # # Available options: -SBBS_SRC ?= $(XPDEV)/../sbbs3 -CFLAGS += -I$(SBBS_SRC) - -JS_CFLAGS += -DJAVASCRIPT - -vpath %.c $(SBBS_SRC) -vpath %.cpp $(SBBS_SRC) +SBBS_SRC ?= $(SRC_ROOT)/sbbs3 +SBBS_CFLAGS += -I$(SBBS_SRC) SBBSDEFS := -include sbbsdefs.mk # defines $(SBBSDEFS) -MT_CFLAGS += $(SBBSDEFS) +SBBS_CFLAGS += $(SBBSDEFS) +SBBS_LDFLAGS += -L$(SBBS_SRC)/$(LIBODIR) + +SBBSLIBS += -lsbbs + +$(SBBS): + $(MAKE) -C $(SBBS_SRC) $(LIBODIR)$(DIRSEP)$(LIBPREFIX)sbbs$(SOFILE) + diff --git a/src/sbbs3/Common.make b/src/sbbs3/Common.make new file mode 100644 index 0000000000..2291d17d42 --- /dev/null +++ b/src/sbbs3/Common.make @@ -0,0 +1,3 @@ +# Available Options: + +SBBS = $(SBBS_SRC)$(DIRSEP)$(LIBODIR)$(DIRSEP)$(LIBPREFIX)sbbs$(SOFILE) -- GitLab