From d26f764e7dd4ff0246901868fb23b4b2b925d5dd Mon Sep 17 00:00:00 2001 From: manuel Date: Tue, 15 Mar 2016 15:37:27 +0100 Subject: sync + build fix --- project/cmake/CMakeLists.txt | 1 + project/cmake/scripts/windows/c-flag-overrides.cmake | 6 +++--- project/cmake/scripts/windows/cxx-flag-overrides.cmake | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'project/cmake') diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt index d58aa3c..ea0f622 100644 --- a/project/cmake/CMakeLists.txt +++ b/project/cmake/CMakeLists.txt @@ -280,6 +280,7 @@ core_link_library(XBMC_codec addons/library.xbmc.codec/libXBMC_codec) core_link_library(KODI_guilib addons/library.kodi.guilib/libKODI_guilib) core_link_library(KODI_adsp addons/library.kodi.adsp/libKODI_adsp) core_link_library(XBMC_pvr addons/library.xbmc.pvr/libXBMC_pvr) +core_link_library(KODI_inputstream addons/library.kodi.inputstream/libKODI_inputstream) core_link_library(KODI_peripheral addons/library.kodi.peripheral/libKODI_peripheral) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/system/players/VideoPlayer) diff --git a/project/cmake/scripts/windows/c-flag-overrides.cmake b/project/cmake/scripts/windows/c-flag-overrides.cmake index ab19701..63825a4 100644 --- a/project/cmake/scripts/windows/c-flag-overrides.cmake +++ b/project/cmake/scripts/windows/c-flag-overrides.cmake @@ -1,5 +1,5 @@ if(MSVC) - set(CMAKE_C_FLAGS "/MP /DWIN32 /D_WINDOWS /W3 /Zi /arch:SSE2") - set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /MDd /Ob0 /Od /RTC1 /D_HAS_ITERATOR_DEBUGGING=0 /D_SECURE_SCL=0") - set(CMAKE_C_FLAGS_RELEASE "/MD /Ox /Ob2 /Oi /Ot /Oy /GL /DNDEBUG") + set(CMAKE_C_FLAGS_INIT "/MP /DWIN32 /D_WINDOWS /W3 /Zi /arch:SSE2") + set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Ob0 /Od /RTC1 /D_HAS_ITERATOR_DEBUGGING=0 /D_SECURE_SCL=0") + set(CMAKE_C_FLAGS_RELEASE_INIT "/MD /Ox /Ob2 /Oi /Ot /Oy /GL /DNDEBUG") endif(MSVC) \ No newline at end of file diff --git a/project/cmake/scripts/windows/cxx-flag-overrides.cmake b/project/cmake/scripts/windows/cxx-flag-overrides.cmake index ad3a090..366def3 100644 --- a/project/cmake/scripts/windows/cxx-flag-overrides.cmake +++ b/project/cmake/scripts/windows/cxx-flag-overrides.cmake @@ -1,5 +1,5 @@ if(MSVC) - set(CMAKE_CXX_FLAGS "/MP /DWIN32 /D_WINDOWS /W3 /GR /Zi /EHsc /arch:SSE2") - set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob0 /Od /RTC1 /D_HAS_ITERATOR_DEBUGGING=0 /D_SECURE_SCL=0") - set(CMAKE_CXX_FLAGS_RELEASE "/MD /Ox /Ob2 /Oi /Ot /Oy /GL /DNDEBUG") + set(CMAKE_CXX_FLAGS_INIT "/MP /DWIN32 /D_WINDOWS /W3 /GR /Zi /EHsc /arch:SSE2") + set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Ob0 /Od /RTC1 /D_HAS_ITERATOR_DEBUGGING=0 /D_SECURE_SCL=0") + set(CMAKE_CXX_FLAGS_RELEASE_INIT "/MD /Ox /Ob2 /Oi /Ot /Oy /GL /DNDEBUG") endif(MSVC) \ No newline at end of file -- cgit v1.2.3