diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3afda9d75b967c3c765e16d3d814de2951653840..4f2b6f9d92ab4495eaad07081f7a5cfada8fb3fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,6 +127,9 @@ if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
endif()
endif()
+set(PATH_TO_DIRECTORY_ROOT_SADL "../../../sadl")
+
+
# modify .lldbinit for lldb custom data formatters
if( XCODE )
set( LLDB_INSTALL_ROOT "$ENV{HOME}/.lldb.d" )
diff --git a/sadl b/sadl
index dedd0095bd3f8ca0a760eb0649b028a87b84dcfd..e562317e36575995c29ad2ed0a0d315ea17d2165 160000
--- a/sadl
+++ b/sadl
@@ -1 +1 @@
-Subproject commit dedd0095bd3f8ca0a760eb0649b028a87b84dcfd
+Subproject commit e562317e36575995c29ad2ed0a0d315ea17d2165
diff --git a/source/App/BitstreamExtractorApp/CMakeLists.txt b/source/App/BitstreamExtractorApp/CMakeLists.txt
index a299cf5cca769c71f83b9c683bcfae461625ee79..35e82fcf8ad0ea0e16286949b1c5403315609ec6 100644
--- a/source/App/BitstreamExtractorApp/CMakeLists.txt
+++ b/source/App/BitstreamExtractorApp/CMakeLists.txt
@@ -72,7 +72,7 @@ if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
$<$<CONFIG:RelWithDebInfo>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO}/BitstreamExtractorApp>
$<$<CONFIG:MinSizeRel>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL}/BitstreamExtractorApp>
$<$<CONFIG:Debug>:${CMAKE_SOURCE_DIR}/bin/BitstreamExtractorAppStaticd>
- $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin/BitstreamExtractorAppStatic>
+ $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin${TAG_SUFFIX}/BitstreamExtractorAppStatic>
$<$<CONFIG:RelWithDebInfo>:${CMAKE_SOURCE_DIR}/bin/BitstreamExtractorAppStaticp>
$<$<CONFIG:MinSizeRel>:${CMAKE_SOURCE_DIR}/bin/BitstreamExtractorAppStaticm> )
endif()
diff --git a/source/App/DecoderAnalyserApp/CMakeLists.txt b/source/App/DecoderAnalyserApp/CMakeLists.txt
index 7d3c6e5f9eabb21bf20512329a7ec374a64a471f..01e4cddd081bec8940f597456d1897b4d2f35745 100644
--- a/source/App/DecoderAnalyserApp/CMakeLists.txt
+++ b/source/App/DecoderAnalyserApp/CMakeLists.txt
@@ -1,14 +1,14 @@
# executable
set( EXE_NAME DecoderAnalyserApp )
-include_directories(../../../sadl)
-
# get source files
file( GLOB SRC_FILES "../DecoderApp/*.cpp" )
# get include files
file( GLOB INC_FILES "../DecoderApp/*.h" )
+include_directories(${PATH_TO_DIRECTORY_ROOT_SADL})
+
# get additional libs for gcc on Ubuntu systems
if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
@@ -76,7 +76,7 @@ if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
$<$<CONFIG:RelWithDebInfo>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO}/DecoderAnalyserApp>
$<$<CONFIG:MinSizeRel>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL}/DecoderAnalyserApp>
$<$<CONFIG:Debug>:${CMAKE_SOURCE_DIR}/bin/DecoderAnalyserAppStaticd>
- $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin/DecoderAnalyserAppStatic>
+ $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin${TAG_SUFFIX}/DecoderAnalyserAppStatic>
$<$<CONFIG:RelWithDebInfo>:${CMAKE_SOURCE_DIR}/bin/DecoderAnalyserAppStaticp>
$<$<CONFIG:MinSizeRel>:${CMAKE_SOURCE_DIR}/bin/DecoderAnalyserAppStaticm> )
endif()
diff --git a/source/App/DecoderApp/CMakeLists.txt b/source/App/DecoderApp/CMakeLists.txt
index c0dcad400926b8fc7f58a439a622119f497ab5ee..cc34c7bf56b4bfd2516bf1fabbfda09619962ece 100644
--- a/source/App/DecoderApp/CMakeLists.txt
+++ b/source/App/DecoderApp/CMakeLists.txt
@@ -1,14 +1,14 @@
# executable
set( EXE_NAME DecoderApp )
-include_directories(../../../sadl)
-
# get source files
file( GLOB SRC_FILES "*.cpp" )
# get include files
file( GLOB INC_FILES "*.h" )
+include_directories(${PATH_TO_DIRECTORY_ROOT_SADL})
+
# get additional libs for gcc on Ubuntu systems
if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
@@ -74,7 +74,7 @@ if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
$<$<CONFIG:RelWithDebInfo>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO}/DecoderApp>
$<$<CONFIG:MinSizeRel>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL}/DecoderApp>
$<$<CONFIG:Debug>:${CMAKE_SOURCE_DIR}/bin/DecoderAppStaticd>
- $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin/DecoderAppStatic>
+ $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin${TAG_SUFFIX}/DecoderAppStatic>
$<$<CONFIG:RelWithDebInfo>:${CMAKE_SOURCE_DIR}/bin/DecoderAppStaticp>
$<$<CONFIG:MinSizeRel>:${CMAKE_SOURCE_DIR}/bin/DecoderAppStaticm> )
endif()
diff --git a/source/App/EncoderApp/CMakeLists.txt b/source/App/EncoderApp/CMakeLists.txt
index f5a744228c6272c88ef9deedddf3d785558a9837..077a1ba608d3fbb8ee98728db263bb27870fe925 100644
--- a/source/App/EncoderApp/CMakeLists.txt
+++ b/source/App/EncoderApp/CMakeLists.txt
@@ -1,14 +1,15 @@
# executable
set( EXE_NAME EncoderApp )
-include_directories(../../../sadl)
-
# get source files
file( GLOB SRC_FILES "*.cpp" )
# get include files
file( GLOB INC_FILES "*.h" )
+include_directories(${PATH_TO_DIRECTORY_ROOT_SADL})
+
+
# get additional libs for gcc on Ubuntu systems
if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
@@ -84,7 +85,7 @@ if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
$<$<CONFIG:RelWithDebInfo>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO}/EncoderApp>
$<$<CONFIG:MinSizeRel>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL}/EncoderApp>
$<$<CONFIG:Debug>:${CMAKE_SOURCE_DIR}/bin/EncoderAppStaticd>
- $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin/EncoderAppStatic>
+ $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin${TAG_SUFFIX}/EncoderAppStatic>
$<$<CONFIG:RelWithDebInfo>:${CMAKE_SOURCE_DIR}/bin/EncoderAppStaticp>
$<$<CONFIG:MinSizeRel>:${CMAKE_SOURCE_DIR}/bin/EncoderAppStaticm> )
endif()
diff --git a/source/App/Parcat/CMakeLists.txt b/source/App/Parcat/CMakeLists.txt
index 12edc317ad223c8274d0234332fe9b2edf109db7..2a5151984e796b7bf38373c1456b5cc6ea6a76bc 100644
--- a/source/App/Parcat/CMakeLists.txt
+++ b/source/App/Parcat/CMakeLists.txt
@@ -24,7 +24,7 @@ if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
$<$<CONFIG:RelWithDebInfo>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO}/parcat>
$<$<CONFIG:MinSizeRel>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL}/parcat>
$<$<CONFIG:Debug>:${CMAKE_SOURCE_DIR}/bin/parcatStaticd>
- $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin/parcatStatic>
+ $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin${TAG_SUFFIX}/parcatStatic>
$<$<CONFIG:RelWithDebInfo>:${CMAKE_SOURCE_DIR}/bin/parcatStaticp>
$<$<CONFIG:MinSizeRel>:${CMAKE_SOURCE_DIR}/bin/parcatStaticm> )
endif()
diff --git a/source/App/SEIRemovalApp/CMakeLists.txt b/source/App/SEIRemovalApp/CMakeLists.txt
index cb783adfff2cbc83d841ea84e9b79372f7698efa..ab66b167a931d65df0bdda4e2a483b0ecff29981 100644
--- a/source/App/SEIRemovalApp/CMakeLists.txt
+++ b/source/App/SEIRemovalApp/CMakeLists.txt
@@ -72,7 +72,7 @@ if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
$<$<CONFIG:RelWithDebInfo>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO}/SEIRemovalApp>
$<$<CONFIG:MinSizeRel>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL}/SEIRemovalApp>
$<$<CONFIG:Debug>:${CMAKE_SOURCE_DIR}/bin/SEIRemovalAppStaticd>
- $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin/SEIRemovalAppStatic>
+ $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin${TAG_SUFFIX}/SEIRemovalAppStatic>
$<$<CONFIG:RelWithDebInfo>:${CMAKE_SOURCE_DIR}/bin/SEIRemovalAppStaticp>
$<$<CONFIG:MinSizeRel>:${CMAKE_SOURCE_DIR}/bin/SEIRemovalAppStaticm> )
endif()
diff --git a/source/App/StreamMergeApp/CMakeLists.txt b/source/App/StreamMergeApp/CMakeLists.txt
index 77c53ece6b5e192580b86a7f3b7dac9e4c0b6290..e141965e2a67744d92aaceb0f174373f3d6d583a 100644
--- a/source/App/StreamMergeApp/CMakeLists.txt
+++ b/source/App/StreamMergeApp/CMakeLists.txt
@@ -72,7 +72,7 @@ if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
$<$<CONFIG:RelWithDebInfo>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO}/StreamMergeApp>
$<$<CONFIG:MinSizeRel>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL}/StreamMergeApp>
$<$<CONFIG:Debug>:${CMAKE_SOURCE_DIR}/bin/StreamMergeAppStaticd>
- $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin/StreamMergeAppStatic>
+ $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin${TAG_SUFFIX}/StreamMergeAppStatic>
$<$<CONFIG:RelWithDebInfo>:${CMAKE_SOURCE_DIR}/bin/StreamMergeAppStaticp>
$<$<CONFIG:MinSizeRel>:${CMAKE_SOURCE_DIR}/bin/StreamMergeAppStaticm> )
endif()
diff --git a/source/App/SubpicMergeApp/CMakeLists.txt b/source/App/SubpicMergeApp/CMakeLists.txt
index dd8fac45fd1f432db633da32662435936ece5309..5212c3b6917d5fbc08a21d5749fe869d3ed6891b 100644
--- a/source/App/SubpicMergeApp/CMakeLists.txt
+++ b/source/App/SubpicMergeApp/CMakeLists.txt
@@ -72,7 +72,7 @@ if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
$<$<CONFIG:RelWithDebInfo>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO}/SubpicMergeApp>
$<$<CONFIG:MinSizeRel>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL}/SubpicMergeApp>
$<$<CONFIG:Debug>:${CMAKE_SOURCE_DIR}/bin/SubpicMergeAppStaticd>
- $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin/SubpicMergeAppStatic>
+ $<$<CONFIG:Release>:${CMAKE_SOURCE_DIR}/bin${TAG_SUFFIX}/SubpicMergeAppStatic>
$<$<CONFIG:RelWithDebInfo>:${CMAKE_SOURCE_DIR}/bin/SubpicMergeAppStaticp>
$<$<CONFIG:MinSizeRel>:${CMAKE_SOURCE_DIR}/bin/SubpicMergeAppStaticm> )
endif()
diff --git a/source/Lib/CommonAnalyserLib/CMakeLists.txt b/source/Lib/CommonAnalyserLib/CMakeLists.txt
index 3c625d9f5d0709bb7086fd51db3401fcd4412494..8de08558fe1f627d33f7688ffed57be3a0b0bfbe 100644
--- a/source/Lib/CommonAnalyserLib/CMakeLists.txt
+++ b/source/Lib/CommonAnalyserLib/CMakeLists.txt
@@ -43,8 +43,7 @@ set( SRC_FILES ${BASE_SRC_FILES} ${X86_SRC_FILES} ${SSE41_SRC_FILES} ${SSE42_SRC
# get all include files
set( INC_FILES ${BASE_INC_FILES} ${X86_INC_FILES} ${MD5_INC_FILES} )
-include_directories(../../../sadl)
-
+include_directories(${PATH_TO_DIRECTORY_ROOT_SADL})
# library
add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} )
diff --git a/source/Lib/CommonLib/CMakeLists.txt b/source/Lib/CommonLib/CMakeLists.txt
index 4608e52e73263a065c24e75149d62fc5b296afb5..8894f6dd8e0598ca9bd69dcc79ff1d30171eedc6 100644
--- a/source/Lib/CommonLib/CMakeLists.txt
+++ b/source/Lib/CommonLib/CMakeLists.txt
@@ -43,8 +43,7 @@ set( SRC_FILES ${BASE_SRC_FILES} ${X86_SRC_FILES} ${SSE41_SRC_FILES} ${SSE42_SRC
# get all include files
set( INC_FILES ${BASE_INC_FILES} ${X86_INC_FILES} ${MD5_INC_FILES} )
-include_directories(../../../sadl)
-
+include_directories(${PATH_TO_DIRECTORY_ROOT_SADL})
# library
add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} )
diff --git a/source/Lib/DecoderAnalyserLib/CMakeLists.txt b/source/Lib/DecoderAnalyserLib/CMakeLists.txt
index 4bed089eee7c1299f25568cc0d10093ff1144fad..ff4022147945391e99830de834b4a8bff97fa60c 100644
--- a/source/Lib/DecoderAnalyserLib/CMakeLists.txt
+++ b/source/Lib/DecoderAnalyserLib/CMakeLists.txt
@@ -1,8 +1,6 @@
# library
set( LIB_NAME DecoderAnalyserLib )
-include_directories(../../../sadl)
-
# get source files
file( GLOB SRC_FILES "../DecoderLib/*.cpp" )
@@ -14,7 +12,9 @@ if( MSVC )
file( GLOB NATVIS_FILES "../../VisualStudio/*.natvis" )
endif()
-# library
+include_directories(${PATH_TO_DIRECTORY_ROOT_SADL})
+
+
add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} )
target_compile_definitions( ${LIB_NAME} PUBLIC RExt__DECODER_DEBUG_BIT_STATISTICS=1 )
target_compile_definitions( ${LIB_NAME} PUBLIC RExt__DECODER_DEBUG_TOOL_STATISTICS=1 )
diff --git a/source/Lib/DecoderLib/CMakeLists.txt b/source/Lib/DecoderLib/CMakeLists.txt
index 16d74ce7e9d312ade1c02ebed6e9431d57830fe3..7d9ded8a9361a5642b88882c02828b88d7948aca 100644
--- a/source/Lib/DecoderLib/CMakeLists.txt
+++ b/source/Lib/DecoderLib/CMakeLists.txt
@@ -1,8 +1,6 @@
# library
set( LIB_NAME DecoderLib )
-include_directories(../../../sadl)
-
# get source files
file( GLOB SRC_FILES "*.cpp" )
@@ -14,7 +12,8 @@ if( MSVC )
file( GLOB NATVIS_FILES "../../VisualStudio/*.natvis" )
endif()
-# library
+include_directories(${PATH_TO_DIRECTORY_ROOT_SADL})
+
add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} )
target_compile_definitions( ${LIB_NAME} PUBLIC )
diff --git a/source/Lib/EncoderLib/CMakeLists.txt b/source/Lib/EncoderLib/CMakeLists.txt
index a6d6f09437c040617066d5a9af1289683ac970ec..b3d998427e0d10051b1c6f4d4e164b53dcd21dd3 100644
--- a/source/Lib/EncoderLib/CMakeLists.txt
+++ b/source/Lib/EncoderLib/CMakeLists.txt
@@ -1,8 +1,6 @@
# library
set( LIB_NAME EncoderLib )
-include_directories(../../../sadl)
-
# get source files
file( GLOB SRC_FILES "*.cpp" )
@@ -14,7 +12,8 @@ if( MSVC )
file( GLOB NATVIS_FILES "../../VisualStudio/*.natvis" )
endif()
-# library
+include_directories(${PATH_TO_DIRECTORY_ROOT_SADL})
+
add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} )
target_compile_definitions( ${LIB_NAME} PUBLIC )