Merge branch '762-makefile-build-does-not-work-on-macos-without-include_split-1' into 'main' (674bafe7) · Commits · IVAS Codec Public Collaboration / IVAS Codec

Makefile

+12 −0

Original line number	Diff line number	Diff line
		@@ -180,7 +180,11 @@ $(LIB_LIBREND): $(OBJS_LIBREND)
		$(QUIET_AR)$(AR) rcs $@ $^

		$(LIB_LC3PLUS): $(OBJS_LC3PLUS)
		ifeq "$(INCLUDE_SPLIT)" "1"
		$(QUIET_AR)$(AR) rcs $@ $^
		else

		endif

		$(LIB_LIBUTIL): $(OBJS_LIBUTIL)
		$(QUIET_AR)$(AR) rcs $@ $^
		@@ -189,10 +193,18 @@ $(CLI_APIENC): $(OBJS_CLI_APIENC) $(LIB_LIBENC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(L
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC) -L. -livasenc -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC)

		$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)
		ifeq "$(INCLUDE_SPLIT)" "1"
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug -llc3plus $(LDLIBS) -o $(CLI_APIDEC)
		else
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIDEC)
		endif

		$(CLI_APIREND): $(OBJS_CLI_APPREND) $(LIB_LIBREND) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LIBDEC) $(LIB_LC3PLUS)
		ifeq "$(INCLUDE_SPLIT)" "1"
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -livasdec -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIREND)
		else
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -livasdec -livasutil -livasdebug -livascom $(LDLIBS) -o $(CLI_APIREND)
		endif

		libs: $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBREND) $(LIB_LC3PLUS) $(LIB_LIBUTIL)

scripts/makefile_SR.patch

+33 −2

Original line number	Diff line number	Diff line
		--- Makefile 2023-08-15 09:31:05.336005000 +0200
		+++ Makefile_patched2 2023-08-15 09:40:48.407929000 +0200
		--- Makefile 2023-09-20 15:31:46.489165000 +0200
		+++ Makefile_SR 2023-09-20 15:33:58.159451000 +0200
		@@ -134,12 +134,7 @@
		SRCS_LIBENC = $(foreach DIR,$(SRC_LIBENC),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		SRCS_LIBREND = $(foreach DIR,$(SRC_LIBREND),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		@@ -13,3 +13,34 @@

		OBJS_LIBCOM = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.o))
		OBJS_LIBDEBUG = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEBUG:.c=.o))
		@@ -180,11 +175,7 @@
		$(QUIET_AR)$(AR) rcs $@ $^

		$(LIB_LC3PLUS): $(OBJS_LC3PLUS)
		-ifeq "$(INCLUDE_SPLIT)" "1"
		$(QUIET_AR)$(AR) rcs $@ $^
		-else
		-
		-endif

		$(LIB_LIBUTIL): $(OBJS_LIBUTIL)
		$(QUIET_AR)$(AR) rcs $@ $^
		@@ -193,18 +184,10 @@
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC) -L. -livasenc -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC)

		$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)
		-ifeq "$(INCLUDE_SPLIT)" "1"
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug -llc3plus $(LDLIBS) -o $(CLI_APIDEC)
		-else
		- $(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIDEC)
		-endif

		$(CLI_APIREND): $(OBJS_CLI_APPREND) $(LIB_LIBREND) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LIBDEC) $(LIB_LC3PLUS)
		-ifeq "$(INCLUDE_SPLIT)" "1"
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -livasdec -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIREND)
		-else
		- $(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -livasdec -livasutil -livasdebug -livascom $(LDLIBS) -o $(CLI_APIREND)
		-endif

		libs: $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBREND) $(LIB_LC3PLUS) $(LIB_LIBUTIL)

scripts/makefile_noSR.patch

+41 −10

Original line number	Diff line number	Diff line
		--- Makefile 2023-08-15 09:31:05.336005000 +0200
		+++ Makefile_patched 2023-08-15 09:49:15.722019000 +0200
		@@ -6,13 +6,12 @@
		--- Makefile 2023-09-20 15:31:46.489165000 +0200
		+++ Makefile_noSR 2023-09-20 15:40:06.212365000 +0200
		@@ -1,3 +1,4 @@
		+
		# GNU Makefile

		# Paths
		@@ -6,13 +7,12 @@
		SRC_LIBDEC = lib_dec
		SRC_LIBENC = lib_enc
		SRC_LIBREND = lib_rend
		@@ -15,7 +20,7 @@

		# Name of CLI binaries
		CLI_APIDEC ?= IVAS_dec
		@@ -23,7 +22,6 @@
		@@ -23,7 +23,6 @@
		LIB_LIBDEC ?= libivasdec.a
		LIB_LIBENC ?= libivasenc.a
		LIB_LIBREND ?= libivasrend.a
		@@ -23,15 +28,31 @@
		LIB_LIBUTIL ?= libivasutil.a

		# Default tool settings
		@@ -134,26 +132,21 @@
		@@ -117,15 +116,6 @@
		# Source file search paths
		VPATH = $(SRC_DIRS)

		-# Split rendering files
		-SRCS_SPLIT_REND = ivas_CQMFDecoder.c ivas_CQMFEncoder.c ivas_PerceptualModel.c ivas_PredDecoder.c \
		- ivas_PredEncoder.c ivas_RMSEnvGrouping.c ivas_MSPred.c ivas_NoiseGen.c \
		- ivas_cldfb_codec_bitstream.c ivas_splitRend_lcld_dec.c ivas_splitRend_lcld_enc.c \
		- ivas_splitRendererPLC.c ivas_splitRendererPost.c ivas_splitRendererPre.c \
		- ivas_splitRenderer_utils.c split_rend_bfi_file_reader.c split_render_file_read_write.c \
		- ivas_lcld_tables.c
		-
		-
		###############################################################################

		SRCS_LIBCOM = $(foreach DIR,$(SRC_LIBCOM),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		@@ -134,26 +124,19 @@
		SRCS_LIBENC = $(foreach DIR,$(SRC_LIBENC),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		SRCS_LIBREND = $(foreach DIR,$(SRC_LIBREND),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		SRCS_LIBUTIL = $(foreach DIR,$(SRC_LIBUTIL),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		-ifeq "$(INCLUDE_SPLIT)" "1"
		-SRCS_LC3PLUS = $(foreach DIR,$(SRC_LC3PLUS),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		-else
		SRCS_LIBREND := $(filter-out $(SRCS_SPLIT_REND),$(SRCS_LIBREND))
		SRCS_LIBUTIL := $(filter-out $(SRCS_SPLIT_REND),$(SRCS_LIBUTIL))
		-SRCS_LIBREND := $(filter-out $(SRCS_SPLIT_REND),$(SRCS_LIBREND))
		-SRCS_LIBUTIL := $(filter-out $(SRCS_SPLIT_REND),$(SRCS_LIBUTIL))
		-endif

		OBJS_LIBCOM = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.o))
		@@ -51,12 +72,16 @@

		###############################################################################

		@@ -179,28 +172,25 @@
		@@ -179,40 +162,25 @@
		$(LIB_LIBREND): $(OBJS_LIBREND)
		$(QUIET_AR)$(AR) rcs $@ $^

		-$(LIB_LC3PLUS): $(OBJS_LC3PLUS)
		-ifeq "$(INCLUDE_SPLIT)" "1"
		- $(QUIET_AR)$(AR) rcs $@ $^
		-else
		-
		-endif
		-
		$(LIB_LIBUTIL): $(OBJS_LIBUTIL)
		$(QUIET_AR)$(AR) rcs $@ $^
		@@ -66,14 +91,20 @@
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC) -L. -livasenc -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC)

		-$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)
		-ifeq "$(INCLUDE_SPLIT)" "1"
		- $(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug -llc3plus $(LDLIBS) -o $(CLI_APIDEC)
		-else
		+$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG)
		+ $(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIDEC)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIDEC)
		-endif

		-$(CLI_APIREND): $(OBJS_CLI_APPREND) $(LIB_LIBREND) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LIBDEC) $(LIB_LC3PLUS)
		-ifeq "$(INCLUDE_SPLIT)" "1"
		- $(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -livasdec -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIREND)
		-else
		+$(CLI_APIREND): $(OBJS_CLI_APPREND) $(LIB_LIBREND) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LIBDEC)
		+ $(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -livasdec -livasutil -livasdebug -livascom $(LDLIBS) -o $(CLI_APIREND)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -livasdec -livasutil -livasdebug -livascom $(LDLIBS) -o $(CLI_APIREND)
		-endif

		-libs: $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBREND) $(LIB_LC3PLUS) $(LIB_LIBUTIL)
		+libs: $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBREND) $(LIB_LIBUTIL)

Admin message