Commit 2f2d6f6d authored by TYAGIRIS's avatar TYAGIRIS
Browse files

MSVS changes, not compiling yet

parent 78fd2eb0

Makefile

+69 −23
Original line number Diff line number Diff line
@@ -7,24 +7,32 @@ SRC_LIBDEBUG = lib_debug 
SRC_LIBDEC   = lib_dec

SRC_LIBENC   = lib_enc

SRC_LIBREND  = lib_rend

SRC_LIBISAR  = lib_isar

SRC_LC3PLUS  = lib_lc3plus lib_lc3plus/fft

SRC_LIBUTIL  = lib_util

SRC_APP      = apps

BUILD        = build

OBJDIR       = obj



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

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)) 



# Name of CLI binaries

CLI_APIDEC   	?= IVAS_dec

CLI_APIENC   	?= IVAS_cod

CLI_APIREND  	?= IVAS_rend

CLI_APIPOSTREND ?= ISAR_post_rend

LIB_LIBCOM   	?= libivascom.a

LIB_LIBDEBUG 	?= libivasdebug.a

LIB_LIBDEC   	?= libivasdec.a

LIB_LIBENC   	?= libivasenc.a

LIB_LIBREND  	?= libivasrend.a

LIB_LIBISAR  	?= libisar.a

LIB_LC3PLUS  	?= liblc3plus.a

LIB_LIBUTIL  	?= libivasutil.a





# Default tool settings

CC        ?= gcc

RM        ?= rm -f
@@ -124,8 +132,14 @@ CFLAGS += $(foreach DIR,$(SRC_DIRS),-I$(DIR)) 
# Source file search paths

VPATH     = $(SRC_DIRS)



# Filter out files that are not part of the build

EXCLUDED_FILES =

# 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_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





###############################################################################
@@ -135,27 +149,36 @@ SRCS_LIBDEC = $(foreach DIR,$(SRC_LIBDEC),$(patsubst $(DIR)/%,%,$(wildcard $(D 
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)))



SRCS_LIBENC := $(filter-out $(EXCLUDED_FILES),$(SRCS_LIBENC))

SRCS_LIBISAR  = $(foreach DIR,$(SRC_LIBISAR),$(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))

endif



OBJS_LIBCOM      = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.o))

OBJS_LIBDEBUG    = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEBUG:.c=.o))

OBJS_LIBDEC      = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEC:.c=.o))

OBJS_LIBENC      = $(addprefix $(OBJDIR)/,$(SRCS_LIBENC:.c=.o))

OBJS_LIBREND     = $(addprefix $(OBJDIR)/,$(SRCS_LIBREND:.c=.o))

OBJS_LIBISAR     = $(addprefix $(OBJDIR)/,$(SRCS_LIBISAR:.c=.o))

OBJS_LC3PLUS     = $(addprefix $(OBJDIR)/,$(SRCS_LC3PLUS:.c=.o))

OBJS_LIBUTIL     = $(addprefix $(OBJDIR)/,$(SRCS_LIBUTIL:.c=.o))

OBJS_CLI_APIDEC  = $(OBJDIR)/decoder.o

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) \

  $(SRCS_LIBENC:.c=.P) $(SRCS_LIBUTIL:.c=.P) $(SRCS_LIBREND:.c=.P))

  $(SRCS_LIBENC:.c=.P) $(SRCS_LIBUTIL:.c=.P) $(SRCS_LIBREND:.c=.P) $(SRCS_LIBISAR:.c=.P) \

  $(SRCS_LC3PLUS:.c=.P))



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



.PHONY: all clean



all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND)

all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND)



$(OBJDIR):

	$(QUIET)mkdir -p $(OBJDIR)
@@ -163,37 +186,60 @@ $(OBJDIR): 
$(LIB_LIBCOM): $(OBJS_LIBCOM)

	$(QUIET_AR)$(AR) rcs $@ $^



$(LIB_LIBDEC): $(OBJS_LIBDEC) $(OBJS_LIBREND)

$(LIB_LIBDEC): $(OBJS_LIBDEC) $(OBJS_LIBREND) $(OBJS_LIBISAR)

	$(QUIET_AR)$(AR) rcs $@ $^



$(LIB_LIBDEBUG): $(OBJS_LIBDEBUG)

	$(QUIET_AR)$(AR) rcs $@ $^



$(LIB_LIBISAR): $(OBJS_LIBISAR)

	$(QUIET_AR)$(AR) rcs $@ $^



$(LIB_LIBENC): $(OBJS_LIBENC)

	$(QUIET_AR)$(AR) rcs $@ $^



$(LIB_LIBREND): $(OBJS_LIBREND)

$(LIB_LIBREND): $(OBJS_LIBREND) $(OBJS_LIBISAR)

	$(QUIET_AR)$(AR) rcs $@ $^



$(LIB_LC3PLUS): $(OBJS_LC3PLUS)

ifeq "$(INCLUDE_SPLIT)" "1"

	$(QUIET_AR)$(AR) rcs $@ $^

else



endif

# Dependency on OBJS_LIBCOM added temporarily for unit-test to work

$(LIB_LIBUTIL): $(OBJS_LIBUTIL) $(OBJS_LIBCOM)

	$(QUIET_AR)$(AR) rcs $@ $^



$(CLI_APIENC): $(OBJS_CLI_APIENC) $(LIB_LIBENC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG)

$(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_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG)

$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(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)

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)

$(CLI_APIREND): $(OBJS_CLI_APPREND) $(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)

else

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -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)

ifeq "$(INCLUDE_SPLIT)" "1"

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPPOSTREND) -L. -lisar -livasutil -livasdebug -llc3plus -livascom $(LDLIBS) -o $(CLI_APIPOSTREND)

endif



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

libs: $(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) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBUTIL) $(LIB_LIBREND)

	$(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)



$(OBJDIR)/%.o : %.c | $(OBJDIR)

	$(QUIET_CC)$(CC) $(CFLAGS) -c -MD -o $@ $<

Workspace_msvc/Workspace_msvc.sln

+6 −0
Original line number Diff line number Diff line
@@ -20,11 +20,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encoder", "encoder.vcxproj" 
EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer.vcxproj", "{12B4C8A5-1E06-4E30-B443-D1F916F52B47}"

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_lc3plus", "lib_lc3plus.vcxproj", "{95030B82-70CD-4C6B-84D4-61096035BEA2}"

EndProject

Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{51160D4C-55C9-4C16-A792-D94507225746}"

	ProjectSection(SolutionItems) = preProject

		..\.clang-format = ..\.clang-format

	EndProjectSection

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}"

EndProject

Global

	GlobalSection(SolutionConfigurationPlatforms) = preSolution

		Debug|Win32 = Debug|Win32

Workspace_msvc/decoder.vcxproj

+5 −2
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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\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>
@@ -112,7 +112,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

      <AdditionalIncludeDirectories>..\lib_dec;..\lib_com;..\lib_util;..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_dec;..\lib_com;..\lib_util;..\lib_debug;..\lib_isar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <ExceptionHandling />
@@ -157,6 +157,9 @@ 
      <Project>{e822ddaf-0f5f-4cd0-a694-38ae69de74d3}</Project>

      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

    </ProjectReference>

    <ProjectReference Include="lib_isar.vcxproj">

      <Project>{869a305e-d99e-4c3a-bdb3-aa57abcce619}</Project>

    </ProjectReference>    

    <ProjectReference Include="lib_util.vcxproj">

      <Project>{2fa8f384-0775-f3b7-f8c3-85209222fc70}</Project>

      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Workspace_msvc/lib_com.vcxproj

+5 −3
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ 
    </CustomBuildStep>

    <ClCompile>

      <Optimization>Disabled</Optimization>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalIncludeDirectories>..\lib_isar;..\lib_lc3plus;..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions);</PreprocessorDefinitions>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -94,7 +94,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_isar;..\lib_lc3plus;..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <ExceptionHandling />
@@ -236,6 +236,8 @@ 
    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc.c" />

    <ClCompile Include="..\lib_com\ivas_tools.c" />

    <ClCompile Include="..\lib_com\ivas_transient_det.c" />

    <ClCompile Include="..\lib_com\ivas_rotation_com.c" />

    <ClCompile Include="..\lib_com\ivas_limiter.c" />     

    <ClCompile Include="..\lib_com\lag_wind.c" />

    <ClCompile Include="..\lib_com\lerp.c" />

    <ClCompile Include="..\lib_com\limit_t0.c" />

Workspace_msvc/lib_dec.vcxproj

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_rend;..\lib_lc3plus;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -108,7 +108,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_rend;..\lib_lc3plus;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <ExceptionHandling />