Commit 0ef8860c authored by multrus's avatar multrus
Browse files

Merge branch 'main' into 20240425_OSS_attribution_FhG

parents 37edd509 f1580974

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
IVAS_cod

IVAS_dec

IVAS_rend

ISAR_post_rend

obj/

*.a

*.o
@@ -16,6 +17,7 @@ build*/**/* 
IVAS_cod.exe

IVAS_dec.exe

IVAS_rend.exe

ISAR_post_rend.exe

*.user

.vs/

Debug_*/
@@ -54,10 +56,12 @@ scripts/testv/stvOMASA_*.met 
scripts/testv/stvOMASA_*.csv

scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav

scripts/testv/stvOMASA_3ISM_1MASA1TC48c.wav

scripts/testv/stvO*

# default reference binary name

IVAS_cod_ref*

IVAS_dec_ref*

IVAS_rend_ref*

ISAR_post_rend_ref*



# Python files that pop up when running scripts

__pycache__/

.gitlab-ci.yml

+174 −91

File changed.

Preview size limit exceeded, changes collapsed.

CMakeLists.txt

+31 −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")
@@ -115,11 +113,6 @@ elseif(WIN32) 
    -D_CRT_SECURE_NO_WARNINGS

    /MP

  )

  if(NOT INCLUDE_SPLIT)

    add_compile_options("/W4")

    # to be uncommented in CI

    # add_compile_options("/WX")

  endif()

endif()



# configuration options for all platforms
@@ -138,87 +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)

  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)

  endif()

  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)
@@ -232,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

+34 −37
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
@@ -135,32 +139,31 @@ 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)))

ifeq "$(INCLUDE_SPLIT)" "1"

SRCS_LIBISAR  = $(foreach DIR,$(SRC_LIBISAR),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

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_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)
@@ -168,24 +171,23 @@ $(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



$(LIB_LIBUTIL): $(OBJS_LIBUTIL)

	$(QUIET_AR)$(AR) rcs $@ $^
@@ -193,27 +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)

ifeq "$(INCLUDE_SPLIT)" "1"

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

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

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

+17 −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
@@ -95,6 +99,18 @@ Global 
		{95030B82-70CD-4C6B-84D4-61096035BEA2}.Release|Win32.ActiveCfg = Release|Win32

		{95030B82-70CD-4C6B-84D4-61096035BEA2}.Release|Win32.Build.0 = Release|Win32

		{95030B82-70CD-4C6B-84D4-61096035BEA2}.Release|x64.ActiveCfg = Release|Win32

		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Debug|Win32.ActiveCfg = Debug|Win32

		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Debug|Win32.Build.0 = Debug|Win32

		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Debug|x64.ActiveCfg = Debug|Win32

		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Release|Win32.ActiveCfg = Release|Win32

		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Release|Win32.Build.0 = Release|Win32

		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Release|x64.ActiveCfg = Release|Win32

		{12374ADC-0E5C-4FDD-B903-71D572413831}.Debug|Win32.ActiveCfg = Debug|Win32

		{12374ADC-0E5C-4FDD-B903-71D572413831}.Debug|Win32.Build.0 = Debug|Win32

		{12374ADC-0E5C-4FDD-B903-71D572413831}.Debug|x64.ActiveCfg = Debug|Win32

		{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

	EndGlobalSection

	GlobalSection(SolutionProperties) = preSolution

		HideSolutionNode = FALSE