From 92f361c8262e9e87f5a5c04afc6098ca2e3d1ddc Mon Sep 17 00:00:00 2001 From: George Joseph Date: Mon, 9 Dec 2024 12:54:53 -0700 Subject: [PATCH] Allow C++ source files (as extension .cc) in the main directory Although C++ files (as extension .cc) have been handled in the module directories for many years, the main directory was missing one line in its Makefile that prevented C++ files from being recognised there. --- main/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/Makefile b/main/Makefile index 297391746e..e6aa7acece 100644 --- a/main/Makefile +++ b/main/Makefile @@ -31,7 +31,8 @@ ifeq ($(PJPROJECT_BUNDLED),yes) SRC:=$(filter-out libasteriskpj.c,$(SRC)) endif OBJSFILTER:=$(MOD_OBJS) fskmodem_int.o fskmodem_float.o cygload.o buildinfo.o -OBJS=$(filter-out $(OBJSFILTER),$(SRC:.c=.o)) +SRC_CC:=$(wildcard *.cc) +OBJS=$(filter-out $(OBJSFILTER),$(SRC:.c=.o) $(SRC_CC:.cc=.oo)) # we need to link in the objects statically, not as a library, because # otherwise modules will not have them available if none of the static