5 files changed, 16 insertions, 7 deletions

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
diff --git a/scripts/sync_buildenv.sh b/scripts/sync_buildenv.sh
index fa55279..9f24348 100755
--- a/scripts/sync_buildenv.sh
+++ b/scripts/sync_buildenv.sh
@@ -31,6 +31,12 @@ echo -n "pvr.dvbviewer https://github.com/manuelm/pvr.dvbviewer $branch" > proje
 echo -n "all" > project/cmake/addons/addons/pvr.dvbviewer/platforms.txt
 git add project/cmake/addons/addons/
 
-# fix build bug
+# fix build bugs
+for f in project/cmake/scripts/windows/c-flag-overrides.cmake project/cmake/scripts/windows/cxx-flag-overrides.cmake
+do
+  sed -i -re 's#CMAKE_C(XX)?_FLAGS(_(DEBUG|RELEASE))? #CMAKE_C\1_FLAGS\2_INIT #' $f
+  git add $f
+done
+
 sed -i -e 's#${LIBRARY_DIR}/${target}.pdb#$<TARGET_PDB_FILE_NAME:${target}>#' project/cmake/scripts/common/addon-helpers.cmake
 git add project/cmake/scripts/common/addon-helpers.cmake
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h
index 33741d8..0560708 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h
@@ -67,6 +67,8 @@ extern "C" {
       const char *m_strKey;
       const char *m_strValue;
     } m_ListItemProperties[MAX_INFO_COUNT];
+
+    const char *m_libFolder;
   } INPUTSTREAM;
 
   /*!