diff options
Diffstat (limited to 'project')
| -rw-r--r-- | project/BuildDependencies/DownloadMingwBuildEnv.bat | 6 | ||||
| -rw-r--r-- | project/Win32BuildSetup/AppxManifest.xml.in | 4 | ||||
| -rw-r--r-- | project/cmake/modules/FindCCache.cmake | 6 | ||||
| -rw-r--r-- | project/cmake/scripts/common/AddonHelpers.cmake | 2 | ||||
| -rw-r--r-- | project/cmake/scripts/windows/ArchSetup.cmake | 1 |
5 files changed, 11 insertions, 8 deletions
diff --git a/project/BuildDependencies/DownloadMingwBuildEnv.bat b/project/BuildDependencies/DownloadMingwBuildEnv.bat index 616c718010..6f168013dd 100644 --- a/project/BuildDependencies/DownloadMingwBuildEnv.bat +++ b/project/BuildDependencies/DownloadMingwBuildEnv.bat @@ -28,9 +28,9 @@ set build32=yes set build64=no set instdir=%CD% set msyspackages=autoconf automake libtool m4 make gettext patch pkg-config wget p7zip coreutils -set mingwpackages=dlfcn gcc gcc-libs gettext libiconv libgpg-error libpng yasm nettle libtasn1 openssl -set locals32=gnutls-3.4.9-static -set locals64=gnutls-3.4.9-static +set mingwpackages=dlfcn gcc gcc-libs gettext libiconv libgpg-error libpng yasm nettle libtasn1 openssl xz +set locals32=gnutls-3.4.14-static +set locals64=gnutls-3.4.14-static set usemirror=yes set opt=mintty diff --git a/project/Win32BuildSetup/AppxManifest.xml.in b/project/Win32BuildSetup/AppxManifest.xml.in index 44f61dccb0..1516a798ff 100644 --- a/project/Win32BuildSetup/AppxManifest.xml.in +++ b/project/Win32BuildSetup/AppxManifest.xml.in @@ -9,10 +9,10 @@ </Properties> <Dependencies> <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" /> - <PackageDependency Name="Microsoft.VCLibs.140.00" MinVersion="14.0.24123.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" /> + <PackageDependency Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Name="Microsoft.VCLibs.140.00.UWPDesktop" MinVersion="14.0.23810.0"/> </Dependencies> <Resources> - <Resource Language="EN-US" /> + <Resource Language="en-us"/> </Resources> <Applications> <Application Id="Kodi" Executable="Kodi.exe" EntryPoint="Windows.FullTrustApplication"> diff --git a/project/cmake/modules/FindCCache.cmake b/project/cmake/modules/FindCCache.cmake index 3ac4a6d23c..a7fd29faba 100644 --- a/project/cmake/modules/FindCCache.cmake +++ b/project/cmake/modules/FindCCache.cmake @@ -7,7 +7,11 @@ # See: https://crascit.com/2016/04/09/using-ccache-with-cmake/ find_program(CCACHE_PROGRAM ccache) -if(CCACHE_PROGRAM) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(CCACHE REQUIRED_VARS CCACHE_PROGRAM) + +if(CCACHE_FOUND) # Supports Unix Makefiles and Ninja set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CCACHE_PROGRAM}") diff --git a/project/cmake/scripts/common/AddonHelpers.cmake b/project/cmake/scripts/common/AddonHelpers.cmake index 9f7a033dad..bf40799e3a 100644 --- a/project/cmake/scripts/common/AddonHelpers.cmake +++ b/project/cmake/scripts/common/AddonHelpers.cmake @@ -158,7 +158,7 @@ macro (build_addon target prefix libs) endif() add_cpack_workaround(${target} ${${prefix}_VERSION} ${ext}) else() - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL rbpi OR CORE_SYSTEM_NAME STREQUAL freebsd) if(NOT OVERRIDE_PATHS) if(CMAKE_INSTALL_PREFIX AND NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT CMAKE_INSTALL_PREFIX STREQUAL "${${APP_NAME_UC}_PREFIX}") message(WARNING "CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} differs from ${APP_NAME} prefix, changing to ${${APP_NAME_UC}_PREFIX}. Please pass -DOVERRIDE_PATHS=1 to skip this check") diff --git a/project/cmake/scripts/windows/ArchSetup.cmake b/project/cmake/scripts/windows/ArchSetup.cmake index b912dcbe69..431b6414cc 100644 --- a/project/cmake/scripts/windows/ArchSetup.cmake +++ b/project/cmake/scripts/windows/ArchSetup.cmake @@ -27,7 +27,6 @@ set(SYSTEM_DEFINES -DNOMINMAX -D_USE_32BIT_TIME_T -DHAS_DX -D__STDC_CONSTANT_MAC -DTAGLIB_STATIC -DNPT_CONFIG_ENABLE_LOGGING -DPLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi" -DPLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi" - -DBUILDING_WITH_CMAKE $<$<CONFIG:Debug>:-DD3D_DEBUG_INFO -D_ITERATOR_DEBUG_LEVEL=0>) # Make sure /FS is set for Visual Studio in order to prevent simultanious access to pdb files. |