Commit 69394535 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

remainder of SR float changes (not compiling yet)

parent 8b4bd143

CMakeLists.txt

+36 −61
Original line number Diff line number Diff line
@@ -27,14 +27,12 @@ 
#        # or build on command line, e.g.:

#        cmake --build . --config Debug

#        cmake --build . --config Release

#

# INCLUDE_SPLIT is not set by default. If split rendering is used, then add -D INCLUDE_SPLIT=1 to the build command





cmake_minimum_required(VERSION 3.1)



set(CMAKE_C_STANDARD 99)





# configuration options for UNIX

if(UNIX)

  set(TARGET_PLATFORM ""  CACHE STRING "i686 / x86_64")
@@ -60,7 +58,10 @@ if(UNIX) 
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffp-contract=off")  # disable floating point operation contraction

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long")

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes")

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wno-unused-parameter")

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter")

  # to be uncommented in CI

  # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")



  # CLANG

  if(CLANG)

    find_program(clangBin NAMES /home/amm-archiv/soft/Linux/clang/current/bin/clang clang REQUIRED)
@@ -112,8 +113,6 @@ elseif(WIN32) 
    -D_CRT_SECURE_NO_WARNINGS

    /MP

  )

  # CMake sets /W3 by default, until CMake version 3.15. Instead of setting /W4 separately, replace in existing settings

  string(REGEX REPLACE "/W3" "/W4" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")

endif()



# configuration options for all platforms
@@ -132,88 +131,61 @@ add_library(lib_com ${libComSrcs} ${libComHeaders}) 
if(UNIX)

  target_link_libraries(lib_com PRIVATE m)

endif()

target_include_directories(lib_com PUBLIC lib_com PRIVATE lib_enc lib_dec lib_rend lib_debug)

if(INCLUDE_SPLIT)

target_include_directories(lib_com PUBLIC lib_com PRIVATE lib_enc lib_dec lib_rend lib_debug lib_isar)

target_include_directories(lib_com PRIVATE lib_lc3plus)

endif()



file(GLOB libDebugSrcs "lib_debug/*.c")

file(GLOB libDebugHeaders "lib_debug/*.h")

add_library(lib_debug ${libDebugSrcs} ${libDebugHeaders})

target_link_libraries(lib_debug lib_com)

target_include_directories(lib_debug PUBLIC lib_debug PRIVATE lib_enc lib_dec lib_rend)

target_include_directories(lib_debug PUBLIC lib_debug PRIVATE lib_enc lib_dec lib_rend lib_isar)



file(GLOB libEncSrcs "lib_enc/*.c")

file(GLOB libEncHeaders "lib_enc/*.h")

add_library(lib_enc ${libEncSrcs} ${libEncHeaders})

target_link_libraries(lib_enc lib_com lib_debug)

target_include_directories(lib_enc PUBLIC lib_enc PRIVATE lib_dec lib_rend)

if(INCLUDE_SPLIT)

target_include_directories(lib_enc PUBLIC lib_enc PRIVATE lib_dec lib_rend lib_isar)

target_include_directories(lib_enc PRIVATE lib_lc3plus)

endif()



if(INCLUDE_SPLIT)

file(GLOB libLC3plusSrcs "lib_lc3plus/*.c")

file(GLOB libLC3plusHeaders "lib_lc3plus/*.h")

add_library(lib_lc3plus ${libLC3plusSrcs} ${libLC3plusHeaders})

  target_include_directories(lib_lc3plus PUBLIC lib_lc3plus)

  target_link_libraries(lib_lc3plus lib_com) # For including options.h, which is needed for instrumentation to work correctly

  if(WMOPS)

  target_link_libraries(lib_lc3plus lib_debug)

  endif()

endif()

target_include_directories(lib_lc3plus PUBLIC lib_lc3plus PRIVATE lib_com lib_debug)



file(GLOB libRendSrcs "lib_rend/*.c")

file(GLOB libRendHeaders "lib_rend/*.h")

if(NOT INCLUDE_SPLIT)

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*lc3plus.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*ivas_cldfb_codec.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*splitRend.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*splitrenderer.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*ivas_lcld.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*ivas_Pred.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*ivas_RMSEnv.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*ivas_PerceptualModel.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*ivas_lcld_rom_tables.*\.c$")

  list(FILTER libRendHeaders EXCLUDE REGEX ".*lib_rend\/.*lc3plus.*\.h$")

  list(FILTER libRendHeaders EXCLUDE REGEX ".*lib_rend\/.*splitRend.*\.h$")

  list(FILTER libRendHeaders EXCLUDE REGEX ".*lib_rend\/.*ivas_cldfb_codec.*\.h$")

  list(FILTER libRendHeaders EXCLUDE REGEX ".*lib_rend\/.*ivas_lcld_rom_tables.*\.h$")

endif()



add_library(lib_rend ${libRendSrcs} ${libRendHeaders})

target_link_libraries(lib_rend lib_dec lib_com lib_debug) # Todo refactor: This dependency on lib_dec should be removed.

if(INCLUDE_SPLIT)

  target_link_libraries(lib_rend lib_lc3plus)

endif()

target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_enc)

target_link_libraries(lib_rend lib_lc3plus lib_isar)

target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_enc lib_isar)





file(GLOB libDecSrcs "lib_dec/*.c")

file(GLOB libDecHeaders "lib_dec/*.h")

add_library(lib_dec ${libDecSrcs} ${libDecHeaders})

target_link_libraries(lib_dec lib_com lib_rend lib_debug)

target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc)

target_link_libraries(lib_dec lib_com lib_rend lib_debug lib_isar)

target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc lib_isar)



file(GLOB libUtilSrcs "lib_util/*.c")

file(GLOB libUtilHeaders "lib_util/*.h")

if(NOT INCLUDE_SPLIT)

  list(FILTER libUtilSrcs EXCLUDE REGEX ".*lib_util\/.*split_rend.*\.c$")

endif()

add_library(lib_util ${libUtilSrcs} ${libUtilHeaders})

target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_dec lib_rend lib_debug)

if(INCLUDE_SPLIT)

  target_include_directories(lib_util PRIVATE lib_lc3plus)

endif()

target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar)



if(INCLUDE_SPLIT)

if(NOT WMOPS)

  file(GLOB unitTestIvasLc3plusSrcs "scripts/split_rendering/lc3plus/*.c")

  add_executable(ivas_lc3plus_unit_test ${unitTestIvasLc3plusSrcs})

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug)

  endif()

  add_executable(ivas_lc3plus_unit_test ${CMAKE_SOURCE_DIR}/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c)

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug lib_isar)

endif()



file(GLOB libISARSrcs "lib_isar/*.c")

file(GLOB libISARHeaders "lib_isar/*.h")



add_library(lib_isar ${libISARSrcs} ${libISARHeaders})

target_link_libraries(lib_isar lib_com lib_debug lib_lc3plus) # Todo refactor: This dependency on lib_dec should be removed.

target_include_directories(lib_isar PUBLIC lib_isar PRIVATE lib_enc lib_dec lib_rend)





add_executable(IVAS_cod apps/encoder.c)

target_link_libraries(IVAS_cod lib_enc lib_util)

if(WIN32)
@@ -227,20 +199,23 @@ if(WIN32) 
endif()



add_executable(IVAS_rend apps/renderer.c)

target_link_libraries(IVAS_rend lib_rend lib_util)

target_link_libraries(IVAS_rend lib_rend lib_util lib_isar)

target_include_directories(IVAS_rend PRIVATE lib_enc)



add_executable(ISAR_post_rend apps/isar_post_rend.c)

target_link_libraries(ISAR_post_rend lib_isar lib_util)

target_include_directories(ISAR_post_rend PRIVATE lib_isar)



if(COPY_EXECUTABLES_FROM_BUILD_DIR)

  # Optionally copy executables to the same place where Make puts them (useful for tests that expect executables in specific places)

  add_custom_command(TARGET IVAS_cod POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_cod>" "${CMAKE_CURRENT_SOURCE_DIR}/")

  add_custom_command(TARGET IVAS_dec POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_dec>" "${CMAKE_CURRENT_SOURCE_DIR}/")

  add_custom_command(TARGET IVAS_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_rend>" "${CMAKE_CURRENT_SOURCE_DIR}/")

  if(INCLUDE_SPLIT)

  add_custom_command(TARGET ISAR_post_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ISAR_post_rend>" "${CMAKE_CURRENT_SOURCE_DIR}/")

  if (NOT WMOPS)

    add_custom_command(TARGET ivas_lc3plus_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ivas_lc3plus_unit_test>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/split_rendering/lc3plus")

  endif()

endif()

endif()



# Allow creating packages for CMake install

install(TARGETS lib_enc lib_dec lib_rend lib_com lib_util ARCHIVE DESTINATION lib)

Makefile

+36 −21
Original line number Diff line number Diff line
@@ -6,26 +6,30 @@ 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_LC3PLUS) $(SRC_LIBUTIL) $(SRC_APP)) 

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
@@ -57,8 +61,9 @@ endif 
# C compiler flags

CFLAGS   += -std=c99 -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long     \

            -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes  \

            -Werror-implicit-function-declaration \

            -Wno-implicit-fallthrough -ffp-contract=off

# to be uncommented in CI

# CFLAGS += -Werror



# libs to link

LDLIBS   += -lm
@@ -134,6 +139,7 @@ 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_LIBISAR  = $(foreach DIR,$(SRC_LIBISAR),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

SRCS_LC3PLUS  = $(foreach DIR,$(SRC_LC3PLUS),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))



OBJS_LIBCOM      = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.o))
@@ -141,20 +147,23 @@ 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_LC3PLUS:.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)
@@ -162,16 +171,19 @@ $(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)
@@ -183,19 +195,22 @@ $(LIB_LIBUTIL): $(OBJS_LIBUTIL) 
$(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) $(LIB_LC3PLUS)

$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS) $(LIB_LIBISAR)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug -llc3plus $(LDLIBS) -o $(CLI_APIDEC)



$(CLI_APIREND): $(OBJS_CLI_APPREND) $(LIB_LIBREND) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LIBDEC) $(LIB_LC3PLUS)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -livasdec -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIREND)

$(CLI_APIREND): $(OBJS_CLI_APPREND) $(LIB_LIBREND) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LIBDEC) $(LIB_LC3PLUS) $(LIB_LIBISAR)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -lisar -livasdec -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIREND)



$(CLI_APIPOSTREND): $(OBJS_CLI_APPPOSTREND) $(LIB_LIBISAR) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)

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



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

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

+5 −1
Original line number Diff line number Diff line
@@ -20,13 +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}") = "LC3plus", "lib_lc3plus.vcxproj", "{95030B82-70CD-4C6B-84D4-61096035BEA2}"

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 />
@@ -155,6 +155,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/isar_post_rend.vcxproj

0 → 100644
+177 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <ItemGroup Label="ProjectConfigurations">

    <ProjectConfiguration Include="Debug|Win32">

      <Configuration>Debug</Configuration>

      <Platform>Win32</Platform>

    </ProjectConfiguration>

    <ProjectConfiguration Include="Release|Win32">

      <Configuration>Release</Configuration>

      <Platform>Win32</Platform>

    </ProjectConfiguration>

  </ItemGroup>

  <PropertyGroup Label="Globals">

    <ProjectName>isar_post_rend</ProjectName>

    <ProjectGuid>{12374ADC-0E5C-4FDD-B903-71D572413831}</ProjectGuid>

    <RootNamespace>isar_post_rend</RootNamespace>

    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

    <ConfigurationType>Application</ConfigurationType>

    <PlatformToolset>v141</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

    <ConfigurationType>Application</ConfigurationType>

    <PlatformToolset>v141</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  <ImportGroup Label="ExtensionSettings">

  </ImportGroup>

  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

  </ImportGroup>

  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

  </ImportGroup>

  <PropertyGroup Label="UserMacros" />

  <PropertyGroup>

    <_ProjectFileVersion>15.0.27428.2015</_ProjectFileVersion>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

    <OutDir>..\</OutDir>

    <IntDir>.\Debug_$(ProjectName)\</IntDir>

    <LinkIncremental>false</LinkIncremental>

    <GenerateManifest>false</GenerateManifest>

    <TargetName>ISAR_post_rend</TargetName>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

    <OutDir>..\</OutDir>

    <IntDir>.\Release_$(ProjectName)\</IntDir>

    <LinkIncremental>false</LinkIncremental>

    <GenerateManifest>false</GenerateManifest>

    <TargetName>ISAR_post_rend</TargetName>

  </PropertyGroup>

  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

    <Midl>

      <TypeLibraryName>$(IntDir)$(ProjectName).tlb</TypeLibraryName>

      <HeaderFileName />

    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

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

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

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

      <RuntimeTypeInfo>false</RuntimeTypeInfo>

      <PrecompiledHeader />

      <PrecompiledHeaderOutputFile />

      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>

      <WarningLevel>Level4</WarningLevel>

      <SuppressStartupBanner>true</SuppressStartupBanner>

      <DebugInformationFormat>OldStyle</DebugInformationFormat>

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <Culture>0x0c0c</Culture>

    </ResourceCompile>

    <Link>

      <AdditionalDependencies />

      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>

      <SuppressStartupBanner>true</SuppressStartupBanner>

      <ManifestFile />

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>

      <SubSystem>Console</SubSystem>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention />

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

  </ItemDefinitionGroup>

  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

    <Midl>

      <TypeLibraryName>$(IntDir)$(ProjectName).tlb</TypeLibraryName>

      <HeaderFileName />

    </Midl>

    <ClCompile>

      <Optimization>MaxSpeed</Optimization>

      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

      <IntrinsicFunctions>false</IntrinsicFunctions>

      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

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

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

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

      <FunctionLevelLinking>true</FunctionLevelLinking>

      <FloatingPointModel>Precise</FloatingPointModel>

      <RuntimeTypeInfo>false</RuntimeTypeInfo>

      <PrecompiledHeader />

      <PrecompiledHeaderOutputFile />

      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>

      <WarningLevel>Level4</WarningLevel>

      <SuppressStartupBanner>true</SuppressStartupBanner>

      <DebugInformationFormat />

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <Culture>0x0c0c</Culture>

    </ResourceCompile>

    <Link>

      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>

      <SuppressStartupBanner>true</SuppressStartupBanner>

      <ManifestFile />

      <GenerateDebugInformation>false</GenerateDebugInformation>

      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>

      <SubSystem>Console</SubSystem>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention />

      <TargetMachine>MachineX86</TargetMachine>

      <IgnoreSpecificDefaultLibraries>libcmtd.lib</IgnoreSpecificDefaultLibraries>

    </Link>

  </ItemDefinitionGroup>

  <ItemGroup>

    <ClCompile Include="..\apps\isar_post_rend.c" />

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="lib_debug.vcxproj">

      <Project>{54509728-928B-44D9-A118-A6F92F08B34F}</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>

    </ProjectReference>

    <ProjectReference Include="lib_com.vcxproj">

      <Project>{39ec200d-7795-4ff8-b214-b24eda5526ae}</Project>

      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

    </ProjectReference>

  </ItemGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  <ImportGroup Label="ExtensionTargets">

  </ImportGroup>

  <ProjectExtensions>

    <VisualStudio>

      <UserProperties DevPartner_IsInstrumented="0" />

    </VisualStudio>

  </ProjectExtensions>

</Project>
 
 No newline at end of file