Adjustments in windows after linux changes.

diff --git a/core/producer/scene/expression_parser.h b/core/producer/scene/expression_parser.h
index ec50a83e234442636a3a3f393ae5151ef0768121..feb835d60697f7ae52d72374b41d56dd8a4c4931 100644 (file)
--- a/core/producer/scene/expression_parser.h
+++ b/core/producer/scene/expression_parser.h
@@ -60,7 +60,7 @@ static binding<T> parse_expression(
 }
 
 template<>
-binding<std::wstring> parse_expression(
+static binding<std::wstring> parse_expression(
                const std::wstring& str, const variable_repository& var_repo)
 {
        auto cursor = str.cbegin();

diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index 3c56c0cf8e89bf4d0fc1abc3b152e65b07ed636b..90a6543e4eabfc622f22fab6fc1d455c8a847a76 100644 (file)
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -40,7 +40,7 @@ include_directories(${TBB_INCLUDE_PATH})
 source_group(sources ./*)
 
 if (MSVC)
-       set(LIBRARIES_TO_LINK
+       target_link_libraries(casparcg
                alibcof64.lib
                jpeg.lib
                sndfile.lib
@@ -69,7 +69,7 @@ if (MSVC)
                zlibstat.lib
        )
 else ()
-       set(LIBRARIES_TO_LINK
+       target_link_libraries(casparcg
                "${DEPENDENCIES_FOLDER}/asmlib/alibelf64.a"
                avformat
                avcodec
@@ -114,8 +114,6 @@ target_link_libraries(casparcg
                "${CASPARCG_MODULE_PROJECTS}"
 
                reroute
-
-               "${LIBRARIES_TO_LINK}"
 )
 
 set(OUTPUT_FOLDER "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}")