aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
Diffstat (limited to 'project')
-rw-r--r--project/BuildDependencies/scripts/0_package.list4
-rw-r--r--project/VS2010Express/XBMC.vcxproj6
-rw-r--r--project/VS2010Express/XBMC.vcxproj.filters9
-rw-r--r--project/Win32BuildSetup/BuildSetup.bat1
-rw-r--r--project/Win32BuildSetup/genNsisInstaller.nsi3
-rw-r--r--project/cmake/addons/CMakeLists.txt2
-rw-r--r--project/cmake/addons/addons/pvr.stalker/platforms.txt1
-rw-r--r--project/cmake/addons/addons/pvr.stalker/pvr.stalker.txt1
-rw-r--r--project/cmake/addons/addons/pvr.vbox/platforms.txt1
-rw-r--r--project/cmake/addons/addons/pvr.vbox/pvr.vbox.txt1
-rw-r--r--project/cmake/addons/addons/pvr.wmc/pvr.wmc.txt2
-rw-r--r--project/cmake/kodi-config.cmake.in2
-rw-r--r--project/cmake/scripts/common/addon-helpers.cmake7
-rw-r--r--project/cmake/scripts/common/prepare-env.cmake13
-rw-r--r--project/cmake/scripts/linux/UseMultiArch.cmake44
15 files changed, 85 insertions, 12 deletions
diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list
index ab64b4c94a..86a7662939 100644
--- a/project/BuildDependencies/scripts/0_package.list
+++ b/project/BuildDependencies/scripts/0_package.list
@@ -19,14 +19,14 @@ jsonschemabuilder-1.0.0-win32-3.7z
libass-0.12.1-win32.7z
libbluray-0.4.0-win32.zip
libcdio-0.83-win32-2.7z
-libcec-2.2.0-win32-1.7z
+libcec-3.0.0-win32-1.7z
libexpat_2.0.1-win32.7z
libflac-1.2.1-win32.7z
libfribidi-0.19.2-win32.7z
libiconv-1.14-win32-vc120.7z
libjpeg-turbo-1.2.0-win32.7z
liblzo-2.04-win32.7z
-libmicrohttpd-svn-35383-win32-vc120.7z
+libmicrohttpd-svn-35533-win32-vc120.7z
libnfs-1.6.2-win32.7z
libogg-vc100-1.2.0-win32.7z
libplist-1.7-win32-3.7z
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index de976d4c08..cb64dd5df2 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -189,6 +189,7 @@
<ClCompile Include="..\..\xbmc\addons\Repository.cpp" />
<ClCompile Include="..\..\xbmc\addons\Service.cpp" />
<ClCompile Include="..\..\xbmc\addons\Skin.cpp" />
+ <ClCompile Include="..\..\xbmc\addons\UISoundsResource.cpp" />
<ClCompile Include="..\..\xbmc\addons\Webinterface.cpp" />
<ClCompile Include="..\..\xbmc\Application.cpp" />
<ClCompile Include="..\..\xbmc\ApplicationMessenger.cpp" />
@@ -799,6 +800,10 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\..\xbmc\test\TestUtil.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\..\xbmc\test\TestUtils.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -815,6 +820,7 @@
<ClInclude Include="..\..\xbmc\addons\AudioDecoder.h" />
<ClInclude Include="..\..\xbmc\addons\ContextItemAddon.h" />
<ClInclude Include="..\..\xbmc\addons\Webinterface.h" />
+ <ClInclude Include="..\..\xbmc\addons\UISoundsResource.h" />
<ClInclude Include="..\..\xbmc\addons\LanguageResource.h" />
<ClInclude Include="..\..\xbmc\addons\Resource.h" />
<ClInclude Include="..\..\xbmc\ApplicationPlayer.h" />
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index 272f9f6fb7..741d3d4f25 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -3056,6 +3056,9 @@
<ClCompile Include="..\..\xbmc\addons\LanguageResource.cpp">
<Filter>addons</Filter>
</ClCompile>
+ <ClCompile Include="..\..\xbmc\addons\UISoundsResource.cpp">
+ <Filter>addons</Filter>
+ </ClCompile>
<ClCompile Include="..\..\xbmc\filesystem\ResourceFile.cpp">
<Filter>filesystem</Filter>
</ClCompile>
@@ -3081,6 +3084,9 @@
<Filter>music</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\filesystem\NFSDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\test\TestUtil.cpp">
+ <Filter>test</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\xbmc\win32\pch.h">
@@ -5938,6 +5944,9 @@
<ClInclude Include="..\..\xbmc\addons\LanguageResource.h">
<Filter>addons</Filter>
</ClInclude>
+ <ClInclude Include="..\..\xbmc\addons\UISoundsResource.h">
+ <Filter>addons</Filter>
+ </ClInclude>
<ClInclude Include="..\..\xbmc\filesystem\ResourceFile.h">
<Filter>filesystem</Filter>
</ClInclude>
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat
index 19d3f15879..50ad49f490 100644
--- a/project/Win32BuildSetup/BuildSetup.bat
+++ b/project/Win32BuildSetup/BuildSetup.bat
@@ -209,7 +209,6 @@ set WORKSPACE=%CD%\..\..
xcopy ..\..\addons BUILD_WIN32\application\addons /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
xcopy ..\..\system BUILD_WIN32\application\system /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
xcopy ..\..\media BUILD_WIN32\application\media /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
- xcopy ..\..\sounds BUILD_WIN32\application\sounds /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
SET build_path=%CD%
IF %buildbinaryaddons%==true (
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi
index d030bcd528..7c31a5af22 100644
--- a/project/Win32BuildSetup/genNsisInstaller.nsi
+++ b/project/Win32BuildSetup/genNsisInstaller.nsi
@@ -226,8 +226,6 @@ Section "${APP_NAME}" SecAPP
File /r "${app_root}\application\addons\*.*"
SetOutPath "$INSTDIR\media"
File /r "${app_root}\application\media\*.*"
- SetOutPath "$INSTDIR\sounds"
- File /r "${app_root}\application\sounds\*.*"
SetOutPath "$INSTDIR\system"
; remove leftover from old Kodi installation
${If} ${FileExists} "$INSTDIR\system\webserver"
@@ -342,7 +340,6 @@ Section "Uninstall"
RMDir /r "$INSTDIR\addons"
RMDir /r "$INSTDIR\language"
RMDir /r "$INSTDIR\media"
- RMDir /r "$INSTDIR\sounds"
RMDir /r "$INSTDIR\system"
RMDir /r "$INSTDIR\userdata"
Delete "$INSTDIR\*.*"
diff --git a/project/cmake/addons/CMakeLists.txt b/project/cmake/addons/CMakeLists.txt
index 0773713cbf..070c7c7532 100644
--- a/project/cmake/addons/CMakeLists.txt
+++ b/project/cmake/addons/CMakeLists.txt
@@ -122,7 +122,7 @@ include(${APP_ROOT}/project/cmake/scripts/common/check_target_platform.cmake)
# check install permissions
set(ADDON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
check_install_permissions(${CMAKE_INSTALL_PREFIX} can_write)
-if(NOT ${can_write} AND NOT WIN32)
+if(NOT ${can_write} AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(NEED_SUDO TRUE)
set(ADDON_INSTALL_DIR ${CMAKE_BINARY_DIR}/.install)
message(STATUS "NEED_SUDO: ${NEED_SUDO}")
diff --git a/project/cmake/addons/addons/pvr.stalker/platforms.txt b/project/cmake/addons/addons/pvr.stalker/platforms.txt
new file mode 100644
index 0000000000..0702cb5bfb
--- /dev/null
+++ b/project/cmake/addons/addons/pvr.stalker/platforms.txt
@@ -0,0 +1 @@
+all
diff --git a/project/cmake/addons/addons/pvr.stalker/pvr.stalker.txt b/project/cmake/addons/addons/pvr.stalker/pvr.stalker.txt
new file mode 100644
index 0000000000..b74b305a5a
--- /dev/null
+++ b/project/cmake/addons/addons/pvr.stalker/pvr.stalker.txt
@@ -0,0 +1 @@
+pvr.stalker https://github.com/kodi-pvr/pvr.stalker 118b2ef
diff --git a/project/cmake/addons/addons/pvr.vbox/platforms.txt b/project/cmake/addons/addons/pvr.vbox/platforms.txt
new file mode 100644
index 0000000000..baa6044435
--- /dev/null
+++ b/project/cmake/addons/addons/pvr.vbox/platforms.txt
@@ -0,0 +1 @@
+all \ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.vbox/pvr.vbox.txt b/project/cmake/addons/addons/pvr.vbox/pvr.vbox.txt
new file mode 100644
index 0000000000..81d1dcc6e6
--- /dev/null
+++ b/project/cmake/addons/addons/pvr.vbox/pvr.vbox.txt
@@ -0,0 +1 @@
+pvr.vbox https://github.com/kodi-pvr/pvr.vbox 4449aa5
diff --git a/project/cmake/addons/addons/pvr.wmc/pvr.wmc.txt b/project/cmake/addons/addons/pvr.wmc/pvr.wmc.txt
index 14559256ef..98dd98614c 100644
--- a/project/cmake/addons/addons/pvr.wmc/pvr.wmc.txt
+++ b/project/cmake/addons/addons/pvr.wmc/pvr.wmc.txt
@@ -1 +1 @@
-pvr.wmc https://github.com/kodi-pvr/pvr.wmc cf28e4c
+pvr.wmc https://github.com/kodi-pvr/pvr.wmc 37b4b29
diff --git a/project/cmake/kodi-config.cmake.in b/project/cmake/kodi-config.cmake.in
index 118d723cab..bd7065c009 100644
--- a/project/cmake/kodi-config.cmake.in
+++ b/project/cmake/kodi-config.cmake.in
@@ -5,7 +5,7 @@ SET(APP_VERSION_MINOR @APP_VERSION_MINOR@)
IF(NOT WIN32)
SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
ENDIF()
-LIST(APPEND CMAKE_MODULE_PATH @prefix@/lib/kodi)
+LIST(APPEND CMAKE_MODULE_PATH @APP_LIBDIR@/@APP_NAME_LC@)
ADD_DEFINITIONS(@ARCH_DEFINES@ -DBUILD_KODI_ADDON)
include(addon-helpers)
diff --git a/project/cmake/scripts/common/addon-helpers.cmake b/project/cmake/scripts/common/addon-helpers.cmake
index b94df2aebd..fa42b4b184 100644
--- a/project/cmake/scripts/common/addon-helpers.cmake
+++ b/project/cmake/scripts/common/addon-helpers.cmake
@@ -76,7 +76,12 @@ macro (build_addon target prefix libs)
ENDIF(WIN32)
add_cpack_workaround(${target} ${${prefix}_VERSION} ${ext})
ELSE(PACKAGE_ZIP OR PACKAGE_TGZ)
- INSTALL(TARGETS ${target} DESTINATION lib/kodi/addons/${target})
+ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ include(UseMultiArch)
+ else()
+ set(CMAKE_INSTALL_LIBDIR "lib")
+ endif()
+ INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/kodi/addons/${target})
INSTALL(DIRECTORY ${target} DESTINATION share/kodi/addons)
ENDIF(PACKAGE_ZIP OR PACKAGE_TGZ)
endmacro()
diff --git a/project/cmake/scripts/common/prepare-env.cmake b/project/cmake/scripts/common/prepare-env.cmake
index 3413c4519f..a616ed8400 100644
--- a/project/cmake/scripts/common/prepare-env.cmake
+++ b/project/cmake/scripts/common/prepare-env.cmake
@@ -12,6 +12,7 @@ if(EXISTS "${APP_ROOT}/version.txt")
set(${name} "${value}")
endif()
endforeach()
+ string(TOLOWER ${APP_NAME} APP_NAME_LC)
endif()
# bail if we can't parse versions
@@ -49,13 +50,21 @@ if(NOT WIN32)
endif()
endif()
-# kodi-config.cmake.in (further down) expects a "prefix" variable
+# kodi-config.cmake.in (further down) expects "prefix" and "APP_LIBDIR" variables
get_filename_component(prefix "${DEPENDS_PATH}" ABSOLUTE)
+set(APP_LIBDIR "${prefix}/lib")
# generate the proper kodi-config.cmake file
configure_file(${APP_ROOT}/project/cmake/kodi-config.cmake.in ${KODI_LIB_DIR}/kodi-config.cmake @ONLY)
+
# copy cmake helpers to lib/kodi
-file(COPY ${APP_ROOT}/project/cmake/scripts/common/addon-helpers.cmake ${APP_ROOT}/project/cmake/scripts/common/addoptions.cmake DESTINATION ${KODI_LIB_DIR})
+file(COPY ${APP_ROOT}/project/cmake/scripts/common/addon-helpers.cmake
+ ${APP_ROOT}/project/cmake/scripts/common/addoptions.cmake
+ DESTINATION ${KODI_LIB_DIR})
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ file(COPY ${APP_ROOT}/project/cmake/scripts/linux/UseMultiArch.cmake DESTINATION ${KODI_LIB_DIR})
+endif()
# generate xbmc-config.cmake for backwards compatibility to xbmc
configure_file(${APP_ROOT}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xbmc-config.cmake @ONLY)
diff --git a/project/cmake/scripts/linux/UseMultiArch.cmake b/project/cmake/scripts/linux/UseMultiArch.cmake
new file mode 100644
index 0000000000..ce6b3e3b28
--- /dev/null
+++ b/project/cmake/scripts/linux/UseMultiArch.cmake
@@ -0,0 +1,44 @@
+# - Multiarch support in object code library directories
+#
+# This module sets the following variable
+# CMAKE_INSTALL_LIBDIR to lib, lib64 or lib/x86_64-linux-gnu
+# depending on the platform; use this path
+# for platform-specific binaries.
+#
+# CMAKE_INSTALL_LIBDIR_NOARCH to lib or lib64 depending on the platform;
+# use this path for architecture-independent
+# files.
+#
+# Note that it will override the results of GNUInstallDirs if included after
+# that module.
+
+# Fedora uses lib64/ for 64-bit systems, Debian uses lib/x86_64-linux-gnu;
+# Fedora put module files in lib64/ too, but Debian uses lib/ for that
+if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux" AND
+ "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" AND
+ NOT "${CORE_SYSTEM_NAME}" STREQUAL "android")
+ # Debian or Ubuntu?
+ if (EXISTS "/etc/debian_version")
+ set (_libdir_def "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+ set (_libdir_noarch "lib")
+ else (EXISTS "/etc/debian_version")
+ # 64-bit system?
+ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set (_libdir_noarch "lib64")
+ else (CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set (_libdir_noarch "lib")
+ endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set (_libdir_def "${_libdir_noarch}")
+ endif (EXISTS "/etc/debian_version")
+else ()
+ set (_libdir_def "lib")
+ set (_libdir_noarch "lib")
+endif ()
+
+# let the user override if somewhere else is desirable
+set (CMAKE_INSTALL_LIBDIR "${_libdir_def}" CACHE PATH "Object code libraries")
+set (CMAKE_INSTALL_LIBDIR_NOARCH "${_libdir_noarch}" CACHE PATH "Architecture-independent library files")
+mark_as_advanced (
+ CMAKE_INSTALL_LIBDIR
+ CMAKE_INSTALL_LIBDIR_NOARCH
+ )
generated by cgit v1.2.3 (git 2.26.2) at 2025-03-07 13:35:04 +0000