diff options
Diffstat (limited to 'project')
| -rw-r--r-- | project/BuildDependencies/scripts/0_package.list | 2 | ||||
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj | 4 | ||||
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj.filters | 12 | ||||
| -rw-r--r-- | project/cmake/addons/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | project/cmake/scripts/common/addon-helpers.cmake | 9 |
5 files changed, 15 insertions, 19 deletions
diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list index fb49bc0748..b2eaa0b20c 100644 --- a/project/BuildDependencies/scripts/0_package.list +++ b/project/BuildDependencies/scripts/0_package.list @@ -18,7 +18,7 @@ giflib-5.0.5p-win32.7z gnutls-3.2.3-win32.zip jsonschemabuilder-1.0.0-win32-3.7z libass-0.12.1-win32.7z -libbluray-0.4.0-win32.zip +libbluray-0.8.1-win32-vc120.7z libcdio-0.83-win32-2.7z libcec-3.0.0-win32-2.7z libexpat_2.0.1-win32.7z diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 199bd8dd20..163d8b20ae 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -730,7 +730,6 @@ <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralNyxboard.cpp" /> <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralImon.cpp" /> <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralTuner.cpp" /> - <ClCompile Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralManager.cpp" /> <ClCompile Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralSettings.cpp" /> <ClCompile Include="..\..\xbmc\peripherals\Peripherals.cpp" /> <ClCompile Include="..\..\xbmc\pictures\GUIDialogPictureInfo.cpp" /> @@ -1530,7 +1529,6 @@ <ClCompile Include="..\..\xbmc\utils\XMLUtils.cpp" /> <ClCompile Include="..\..\xbmc\video\Bookmark.cpp" /> <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.cpp" /> - <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogFileStacking.cpp" /> <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogFullScreenInfo.cpp" /> <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogSubtitles.cpp" /> <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogTeletext.cpp" /> @@ -2016,7 +2014,6 @@ <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralNIC.h" /> <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralNyxboard.h" /> <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralTuner.h" /> - <ClInclude Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralManager.h" /> <ClInclude Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralSettings.h" /> <ClInclude Include="..\..\xbmc\peripherals\Peripherals.h" /> <ClInclude Include="..\..\xbmc\peripherals\PeripheralTypes.h" /> @@ -2191,7 +2188,6 @@ <ClInclude Include="..\..\xbmc\utils\XMLUtils.h" /> <ClInclude Include="..\..\xbmc\video\Bookmark.h" /> <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.h" /> - <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogFileStacking.h" /> <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogFullScreenInfo.h" /> <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogSubtitles.h" /> <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogTeletext.h" /> diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index 4a8cab1925..d035195943 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -1522,9 +1522,6 @@ <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.cpp"> <Filter>video\dialogs</Filter> </ClCompile> - <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogFileStacking.cpp"> - <Filter>video\dialogs</Filter> - </ClCompile> <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogFullScreenInfo.cpp"> <Filter>video\dialogs</Filter> </ClCompile> @@ -1873,9 +1870,6 @@ <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralTuner.cpp"> <Filter>peripherals\devices</Filter> </ClCompile> - <ClCompile Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralManager.cpp"> - <Filter>peripherals\dialogs</Filter> - </ClCompile> <ClCompile Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralSettings.cpp"> <Filter>peripherals\dialogs</Filter> </ClCompile> @@ -4525,9 +4519,6 @@ <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.h"> <Filter>video\dialogs</Filter> </ClInclude> - <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogFileStacking.h"> - <Filter>video\dialogs</Filter> - </ClInclude> <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogFullScreenInfo.h"> <Filter>video\dialogs</Filter> </ClInclude> @@ -4903,9 +4894,6 @@ <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralTuner.h"> <Filter>peripherals\devices</Filter> </ClInclude> - <ClInclude Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralManager.h"> - <Filter>peripherals\dialogs</Filter> - </ClInclude> <ClInclude Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralSettings.h"> <Filter>peripherals\dialogs</Filter> </ClInclude> diff --git a/project/cmake/addons/CMakeLists.txt b/project/cmake/addons/CMakeLists.txt index e07a9488fd..d1ae271700 100644 --- a/project/cmake/addons/CMakeLists.txt +++ b/project/cmake/addons/CMakeLists.txt @@ -1,6 +1,11 @@ project(kodi-addons) -cmake_minimum_required(VERSION 2.8) +if(WIN32) + # there seems to be a bug in the CMake generator implementation in CMake 2.8.x releases for WIN32 + cmake_minimum_required(VERSION 3.0) +else() + cmake_minimum_required(VERSION 2.8) +endif() list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) diff --git a/project/cmake/scripts/common/addon-helpers.cmake b/project/cmake/scripts/common/addon-helpers.cmake index da2d6a3111..a02836a983 100644 --- a/project/cmake/scripts/common/addon-helpers.cmake +++ b/project/cmake/scripts/common/addon-helpers.cmake @@ -45,8 +45,15 @@ macro (build_addon target prefix libs) SET_TARGET_PROPERTIES(${target} PROPERTIES PREFIX "lib") ENDIF(OS STREQUAL "android") + # get the library's location SET(LIBRARY_LOCATION $<TARGET_FILE:${target}>) - SET(LIBRARY_FILENAME $<TARGET_FILE_NAME:${target}>) + # get the library's filename + if("${CORE_SYSTEM_NAME}" STREQUAL "android") + # for android we need the filename without any version numbers + set(LIBRARY_FILENAME $<TARGET_LINKER_FILE_NAME:${target}>) + else() + SET(LIBRARY_FILENAME $<TARGET_FILE_NAME:${target}>) + endif() # if there's an addon.xml.in we need to generate the addon.xml IF(EXISTS ${PROJECT_SOURCE_DIR}/${target}/addon.xml.in) |