move basops, adapt Makefile + VS project files (4217bbc6) · Commits · SA4 / Audio / IVAS BASOP

Makefile

+22 −15

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		# GNU Makefile

		# Paths
		SRC_LIBBASOP = lib_basop
		SRC_LIBCOM = lib_com
		SRC_LIBDEBUG = lib_debug
		SRC_LIBDEC = lib_dec
		@@ -16,13 +17,14 @@ OBJDIR = obj

		INCLUDE_SPLIT = 1

		SRC_DIRS = $(sort -u $(SRC_LIBCOM) $(SRC_LIBDEBUG) $(SRC_LIBDEC) $(SRC_LIBENC) $(SRC_LIBREND) $(SRC_LIBISAR) $(SRC_LC3PLUS) $(SRC_LIBUTIL) $(SRC_APP))
		SRC_DIRS = $(sort -u $(SRC_LIBBASOP) $(SRC_LIBCOM) $(SRC_LIBDEBUG) $(SRC_LIBDEC) $(SRC_LIBENC) $(SRC_LIBREND) $(SRC_LIBISAR) $(SRC_LC3PLUS) $(SRC_LIBUTIL) $(SRC_APP))

		# Name of CLI binaries
		CLI_APIDEC ?= IVAS_dec
		CLI_APIENC ?= IVAS_cod
		CLI_APIREND ?= IVAS_rend
		CLI_APIPOSTREND ?= ISAR_post_rend
		LIB_LIBBASOP ?= libivasbasop.a
		LIB_LIBCOM ?= libivascom.a
		LIB_LIBDEBUG ?= libivasdebug.a
		LIB_LIBDEC ?= libivasdec.a
		@@ -148,6 +150,7 @@ SRCS_SPLIT_REND = ivas_CQMFDecoder.c ivas_CQMFEncoder.c ivas_PerceptualModel.c i

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

		SRCS_LIBBASOP = $(foreach DIR,$(SRC_LIBBASOP),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		SRCS_LIBCOM = $(foreach DIR,$(SRC_LIBCOM),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		SRCS_LIBDEBUG = $(foreach DIR,$(SRC_LIBDEBUG),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		SRCS_LIBDEC = $(foreach DIR,$(SRC_LIBDEC),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		@@ -162,6 +165,7 @@ else
		# SRCS_LIBUTIL := $(filter-out $(SRCS_SPLIT_REND),$(SRCS_LIBUTIL))
		endif

		OBJS_LIBBASOP = $(addprefix $(OBJDIR)/,$(SRCS_LIBBASOP:.c=.o))
		OBJS_LIBCOM = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.o))
		OBJS_LIBDEBUG = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEBUG:.c=.o))
		OBJS_LIBDEC = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEC:.c=.o))
		@@ -175,7 +179,7 @@ OBJS_CLI_APIENC = $(OBJDIR)/encoder.o
		OBJS_CLI_APPREND = $(OBJDIR)/renderer.o
		OBJS_CLI_APPPOSTREND = $(OBJDIR)/isar_post_rend.o

		DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.P) $(SRCS_LIBDEBUG:.c=.P) $(SRCS_LIBDEC:.c=.P) \
		DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBBASOP:.c=.P) $(SRCS_LIBCOM:.c=.P) $(SRCS_LIBDEBUG:.c=.P) $(SRCS_LIBDEC:.c=.P) \
		$(SRCS_LIBENC:.c=.P) $(SRCS_LIBUTIL:.c=.P) $(SRCS_LIBREND:.c=.P) $(SRCS_LIBISAR:.c=.P) \
		$(SRCS_LC3PLUS:.c=.P))

		@@ -188,6 +192,9 @@ all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND)
		$(OBJDIR):
		$(QUIET)mkdir -p $(OBJDIR)

		$(LIB_LIBBASOP): $(OBJS_LIBBASOP)
		$(QUIET_AR)$(AR) rcs $@ $^

		$(LIB_LIBCOM): $(OBJS_LIBCOM)
		$(QUIET_AR)$(AR) rcs $@ $^

		@@ -213,38 +220,38 @@ else

		endif
		# Dependency on OBJS_LIBCOM added temporarily for unit-test to work
		$(LIB_LIBUTIL): $(OBJS_LIBUTIL) $(OBJS_LIBCOM)
		$(LIB_LIBUTIL): $(OBJS_LIBUTIL) $(OBJS_LIBBASOP) $(OBJS_LIBCOM)
		$(QUIET_AR)$(AR) rcs $@ $^

		$(CLI_APIENC): $(OBJS_CLI_APIENC) $(LIB_LIBENC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC) -L. -livasenc -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC)
		$(CLI_APIENC): $(OBJS_CLI_APIENC) $(LIB_LIBBASOP) $(LIB_LIBENC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC) -L. -livasbasop -livasenc -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC)

		$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS) $(LIB_LIBISAR)
		$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBBASOP) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS) $(LIB_LIBISAR)
		ifeq "$(INCLUDE_SPLIT)" "1"
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug -llc3plus $(LDLIBS) -o $(CLI_APIDEC)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasbasop -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)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasbasop -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) $(LIB_LIBISAR)
		$(CLI_APIREND): $(OBJS_CLI_APPREND) $(LIB_LIBBASOP) $(LIB_LIBREND) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LIBDEC) $(LIB_LC3PLUS) $(LIB_LIBISAR)
		ifeq "$(INCLUDE_SPLIT)" "1"
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -lisar -livasdec -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIREND)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasbasop -livasrend -lisar -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)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasbasop -livasrend -livasdec -livasutil -livasdebug -livascom $(LDLIBS) -o $(CLI_APIREND)
		endif

		$(CLI_APIPOSTREND): $(OBJS_CLI_APPPOSTREND) $(LIB_LIBISAR) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)
		$(CLI_APIPOSTREND): $(OBJS_CLI_APPPOSTREND) $(LIB_LIBBASOP) $(LIB_LIBISAR) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)
		ifeq "$(INCLUDE_SPLIT)" "1"
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPPOSTREND) -L. -lisar -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIPOSTREND)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPPOSTREND) -L. -livasbasop -lisar -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIPOSTREND)
		endif

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

		clean:
		$(QUIET)$(RM) $(OBJS_LIBENC) $(OBJS_LIBDEC) $(DEPS)
		$(QUIET)$(RM) $(DEPS:.P=.d)
		$(QUIET)test ! -d $(OBJDIR) \|\| rm -rf $(OBJDIR)
		$(QUIET)$(RM) $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBUTIL) $(LIB_LIBREND) $(LIB_LIBISAR) $(LIB_LC3PLUS)
		$(QUIET)$(RM) $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(OBJS_LIBBASOP) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBUTIL) $(LIB_LIBREND) $(LIB_LIBISAR) $(LIB_LC3PLUS)

		$(OBJDIR)/%.o : %.c \| $(OBJDIR)
		$(QUIET_CC)$(CC) $(CFLAGS) -c -MD -o $@ $<

Workspace_msvc/Workspace_msvc.sln

+20 −0

Original line number	Diff line number	Diff line
		@@ -15,10 +15,19 @@ EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_debug", "lib_debug.vcxproj", "{54509728-928B-44D9-A118-A6F92F08B34F}"
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decoder", "decoder.vcxproj", "{E3DCBC31-7FC9-D127-E000-529F8460D5FD}"
		ProjectSection(ProjectDependencies) = postProject
		{63747FE7-94BA-410C-8D7F-EB47555DD994} = {63747FE7-94BA-410C-8D7F-EB47555DD994}
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encoder", "encoder.vcxproj", "{B3FC9DFC-7268-8660-7C0D-B60BAF02C554}"
		ProjectSection(ProjectDependencies) = postProject
		{63747FE7-94BA-410C-8D7F-EB47555DD994} = {63747FE7-94BA-410C-8D7F-EB47555DD994}
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer.vcxproj", "{12B4C8A5-1E06-4E30-B443-D1F916F52B47}"
		ProjectSection(ProjectDependencies) = postProject
		{63747FE7-94BA-410C-8D7F-EB47555DD994} = {63747FE7-94BA-410C-8D7F-EB47555DD994}
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_lc3plus", "lib_lc3plus.vcxproj", "{95030B82-70CD-4C6B-84D4-61096035BEA2}"
		EndProject
		@@ -30,6 +39,11 @@ EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_isar", "lib_isar.vcxproj", "{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}"
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isar_post_rend", "isar_post_rend.vcxproj", "{12374ADC-0E5C-4FDD-B903-71D572413831}"
		ProjectSection(ProjectDependencies) = postProject
		{B3FC9DFC-7268-8660-7C0D-B60BAF02C554} = {B3FC9DFC-7268-8660-7C0D-B60BAF02C554}
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_basop", "lib_basop.vcxproj", "{63747FE7-94BA-410C-8D7F-EB47555DD994}"
		EndProject
		Global
		GlobalSection(SolutionConfigurationPlatforms) = preSolution
		@@ -111,6 +125,12 @@ Global
		{12374ADC-0E5C-4FDD-B903-71D572413831}.Release\|Win32.ActiveCfg = Release\|Win32
		{12374ADC-0E5C-4FDD-B903-71D572413831}.Release\|Win32.Build.0 = Release\|Win32
		{12374ADC-0E5C-4FDD-B903-71D572413831}.Release\|x64.ActiveCfg = Release\|Win32
		{63747FE7-94BA-410C-8D7F-EB47555DD994}.Debug\|Win32.ActiveCfg = Debug\|Win32
		{63747FE7-94BA-410C-8D7F-EB47555DD994}.Debug\|Win32.Build.0 = Debug\|Win32
		{63747FE7-94BA-410C-8D7F-EB47555DD994}.Debug\|x64.ActiveCfg = Debug\|Win32
		{63747FE7-94BA-410C-8D7F-EB47555DD994}.Release\|Win32.ActiveCfg = Release\|Win32
		{63747FE7-94BA-410C-8D7F-EB47555DD994}.Release\|Win32.Build.0 = Release\|Win32
		{63747FE7-94BA-410C-8D7F-EB47555DD994}.Release\|x64.ActiveCfg = Release\|Win32
		EndGlobalSection
		GlobalSection(SolutionProperties) = preSolution
		HideSolutionNode = FALSE

Workspace_msvc/decoder.vcxproj

+7 −4

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@
		</Midl>
		<ClCompile>
		<Optimization>Disabled</Optimization>
		<AdditionalIncludeDirectories>..\lib_dec;..\lib_com;..\lib_util;..\lib_debug;..\lib_isar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_basop;..\lib_dec;..\lib_com;..\lib_util;..\lib_debug;..\lib_isar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<ExceptionHandling />
		<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
		@@ -113,7 +113,7 @@
		<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
		<OmitFramePointers>false</OmitFramePointers>
		<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
		<AdditionalIncludeDirectories>..\lib_dec;..\lib_com;..\lib_util;..\lib_debug;..\lib_isar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_basop;..\lib_dec;..\lib_com;..\lib_util;..\lib_debug;..\lib_isar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<StringPooling>true</StringPooling>
		<ExceptionHandling />
		@@ -155,6 +155,9 @@
		<ClCompile Include="..\lib_util\test_mdct.c" />
		</ItemGroup>
		<ItemGroup>
		<ProjectReference Include="lib_basop.vcxproj">
		<Project>{63747fe7-94ba-410c-8d7f-eb47555dd994}</Project>
		</ProjectReference>
		<ProjectReference Include="lib_dec.vcxproj">
		<Project>{e822ddaf-0f5f-4cd0-a694-38ae69de74d3}</Project>
		<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Workspace_msvc/encoder.vcxproj

+6 −3

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@
		</Midl>
		<ClCompile>
		<Optimization>Disabled</Optimization>
		<AdditionalIncludeDirectories>..\lib_enc;..\lib_com;..\lib_util;..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_basop;..\lib_enc;..\lib_com;..\lib_util;..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<ExceptionHandling />
		<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
		@@ -121,7 +121,7 @@
		<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
		<OmitFramePointers>false</OmitFramePointers>
		<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
		<AdditionalIncludeDirectories>..\lib_enc;..\lib_com;..\lib_util;..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_basop;..\lib_enc;..\lib_com;..\lib_util;..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<StringPooling>true</StringPooling>
		<ExceptionHandling />
		@@ -160,6 +160,9 @@
		<ClCompile Include="..\apps\encoder.c" />
		</ItemGroup>
		<ItemGroup>
		<ProjectReference Include="lib_basop.vcxproj">
		<Project>{63747fe7-94ba-410c-8d7f-eb47555dd994}</Project>
		</ProjectReference>
		<ProjectReference Include="lib_enc.vcxproj">
		<Project>{824da4cf-06f0-45c9-929a-8792f0e19c3e}</Project>
		<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Workspace_msvc/isar_post_rend.vcxproj

+3 −0

Original line number	Diff line number	Diff line
		@@ -150,6 +150,9 @@
		<ClCompile Include="..\apps\isar_post_rend.c" />
		</ItemGroup>
		<ItemGroup>
		<ProjectReference Include="lib_basop.vcxproj">
		<Project>{63747fe7-94ba-410c-8d7f-eb47555dd994}</Project>
		</ProjectReference>
		<ProjectReference Include="lib_debug.vcxproj">
		<Project>{54509728-928B-44D9-A118-A6F92F08B34F}</Project>
		<ReferenceOutputAssembly>false</ReferenceOutputAssembly>