[windows] compile dependencies (except target for x64) from source

.gitignore

@@ -217,15 +217,8 @@ cmake_install.cmake
 /project/BuildDependencies/build
 /project/BuildDependencies/scripts/tmp
 /project/BuildDependencies/src
-/project/BuildDependencies/bin/swig
-/project/BuildDependencies/bin/doxygen
-/project/BuildDependencies/bin/json-rpc
 /project/BuildDependencies/mingwlibs
 /project/BuildDependencies/x64
-/project/BuildDependencies/win10-arm
-/project/BuildDependencies/win10-x64
-/project/BuildDependencies/win10-win32
-/project/BuildDependencies/win32
 
 # /system/players/VideoPlayer
 /system/players/VideoPlayer/*

cmake/installdata/windowsstore/addons.txt

@@ -1,2 +1 @@
-project/BuildDependencies/win10-${ARCH}/addons/*
 system/addon-manifest-uwp.xml

cmake/modules/FindD3DX11Effects.cmake

@@ -12,7 +12,7 @@ if(NOT CORE_SYSTEM_NAME STREQUAL windowsstore)
               "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v8.1;InstallationFolder]/Redist/D3D/${SDK_TARGET_ARCH}"
               "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]/Redist/D3D/${SDK_TARGET_ARCH}"
               "$ENV{WindowsSdkDir}Redist/d3d/${SDK_TARGET_ARCH}"
-            NO_DEFAULT_PATH)
+            NO_DEFAULT_PATH CMAKE_FIND_ROOT_PATH_BOTH)
   if(NOT D3DCOMPILER_DLL)
     message(WARNING "Could NOT find Direct3D Compiler")
   endif()

cmake/modules/FindIconv.cmake

@@ -17,6 +17,7 @@ find_path(ICONV_INCLUDE_DIR NAMES iconv.h)
 
 find_library(ICONV_LIBRARY NAMES iconv libiconv c)
 
+include(CheckFunctionExists)
 set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
 check_function_exists(iconv HAVE_ICONV_FUNCTION)
 if(NOT HAVE_ICONV_FUNCTION)

cmake/modules/FindJsonSchemaBuilder.cmake

@@ -17,27 +17,27 @@ if(NOT TARGET JsonSchemaBuilder::JsonSchemaBuilder)
     find_program(JSONSCHEMABUILDER_EXECUTABLE NAMES "${APP_NAME_LC}-JsonSchemaBuilder" JsonSchemaBuilder
                                    HINTS ${_jsbpath})
 
-    add_executable(JsonSchemaBuilder::JsonSchemaBuilder IMPORTED GLOBAL)
-    set_target_properties(JsonSchemaBuilder::JsonSchemaBuilder PROPERTIES
-                                                       IMPORTED_LOCATION "${JSONSCHEMABUILDER_EXECUTABLE}")
-  elseif(CORE_SYSTEM_NAME STREQUAL windowsstore)
-    get_filename_component(_jsbpath "${DEPENDENCIES_DIR}/bin/json-rpc" ABSOLUTE)
-    find_program(JSONSCHEMABUILDER_EXECUTABLE NAMES "${APP_NAME_LC}-JsonSchemaBuilder" JsonSchemaBuilder
-                                              HINTS ${_jsbpath})
-
     add_executable(JsonSchemaBuilder::JsonSchemaBuilder IMPORTED GLOBAL)
     set_target_properties(JsonSchemaBuilder::JsonSchemaBuilder PROPERTIES
                                                        IMPORTED_LOCATION "${JSONSCHEMABUILDER_EXECUTABLE}")
   else()
-    if(WITH_JSONSCHEMABUILDER)
-      get_filename_component(_jsbpath ${WITH_JSONSCHEMABUILDER} ABSOLUTE)
-      get_filename_component(_jsbpath ${_jsbpath} DIRECTORY)
+    if(WITH_JSONSCHEMABUILDER OR WIN32)
+      if(WITH_JSONSCHEMABUILDER)
+        get_filename_component(_jsbpath ${WITH_JSONSCHEMABUILDER} ABSOLUTE)
+        get_filename_component(_jsbpath ${_jsbpath} DIRECTORY)
+      else()
+        get_filename_component(_jsbpath "${DEPENDENCIES_DIR}/bin/json-rpc" ABSOLUTE)
+      endif()
       find_program(JSONSCHEMABUILDER_EXECUTABLE NAMES "${APP_NAME_LC}-JsonSchemaBuilder" JsonSchemaBuilder
                                                 HINTS ${_jsbpath})
 
       include(FindPackageHandleStandardArgs)
-      find_package_handle_standard_args(JsonSchemaBuilder "Could not find '${APP_NAME_LC}-JsonSchemaBuilder' or 'JsonSchemaBuilder' executable in ${_jsbpath} supplied by -DWITH_JSONSCHEMABUILDER. Make sure the executable file name matches these names!"
-                                        JSONSCHEMABUILDER_EXECUTABLE)
+      if(WITH_JSONSCHEMABUILDER)
+        find_package_handle_standard_args(JsonSchemaBuilder "Could not find '${APP_NAME_LC}-JsonSchemaBuilder' or 'JsonSchemaBuilder' executable in ${_jsbpath} supplied by -DWITH_JSONSCHEMABUILDER. Make sure the executable file name matches these names!"
+                                          JSONSCHEMABUILDER_EXECUTABLE)
+      else()
+        find_package_handle_standard_args(JsonSchemaBuilder DEFAULT_MSG JSONSCHEMABUILDER_EXECUTABLE)
+      endif()
       if(JSONSCHEMABUILDER_FOUND)
         add_executable(JsonSchemaBuilder::JsonSchemaBuilder IMPORTED GLOBAL)
         set_target_properties(JsonSchemaBuilder::JsonSchemaBuilder PROPERTIES

cmake/modules/FindTexturePacker.cmake

@@ -17,27 +17,27 @@ if(NOT TARGET TexturePacker::TexturePacker)
     find_program(TEXTUREPACKER_EXECUTABLE NAMES "${APP_NAME_LC}-TexturePacker" TexturePacker
                                           HINTS ${_tppath})
 
-    add_executable(TexturePacker::TexturePacker IMPORTED GLOBAL)
-    set_target_properties(TexturePacker::TexturePacker PROPERTIES
-                                                       IMPORTED_LOCATION "${TEXTUREPACKER_EXECUTABLE}")
-  elseif(WIN32)
-    get_filename_component(_tppath "${DEPENDENCIES_DIR}/tools/TexturePacker" ABSOLUTE)
-    find_program(TEXTUREPACKER_EXECUTABLE NAMES "${APP_NAME_LC}-TexturePacker.exe" TexturePacker.exe
-                                          HINTS ${_tppath})
-
     add_executable(TexturePacker::TexturePacker IMPORTED GLOBAL)
     set_target_properties(TexturePacker::TexturePacker PROPERTIES
                                                        IMPORTED_LOCATION "${TEXTUREPACKER_EXECUTABLE}")
   else()
-    if(WITH_TEXTUREPACKER)
-      get_filename_component(_tppath ${WITH_TEXTUREPACKER} ABSOLUTE)
-      get_filename_component(_tppath ${_tppath} DIRECTORY)
+    if(WITH_TEXTUREPACKER OR WIN32)
+      if(WITH_TEXTUREPACKER)
+        get_filename_component(_tppath ${WITH_TEXTUREPACKER} ABSOLUTE)
+        get_filename_component(_tppath ${_tppath} DIRECTORY)
+      else()
+        get_filename_component(_tppath "${DEPENDENCIES_DIR}/tools/TexturePacker" ABSOLUTE)
+      endif()
       find_program(TEXTUREPACKER_EXECUTABLE NAMES "${APP_NAME_LC}-TexturePacker" TexturePacker
                                             HINTS ${_tppath})
 
       include(FindPackageHandleStandardArgs)
-      find_package_handle_standard_args(TexturePacker "Could not find '${APP_NAME_LC}-TexturePacker' or 'TexturePacker' executable in ${_tppath} supplied by -DWITH_TEXTUREPACKER. Make sure the executable file name matches these names!"
-                                        TEXTUREPACKER_EXECUTABLE)
+      if(WITH_TEXTUREPACKER)
+        find_package_handle_standard_args(TexturePacker "Could not find '${APP_NAME_LC}-TexturePacker' or 'TexturePacker' executable in ${_tppath} supplied by -DWITH_TEXTUREPACKER. Make sure the executable file name matches these names!"
+                                          TEXTUREPACKER_EXECUTABLE)
+      else()
+        find_package_handle_standard_args(TexturePacker DEFAULT_MSG TEXTUREPACKER_EXECUTABLE)
+      endif()
       if(TEXTUREPACKER_FOUND)
         add_executable(TexturePacker::TexturePacker IMPORTED GLOBAL)
         set_target_properties(TexturePacker::TexturePacker PROPERTIES

cmake/modules/FindXSLT.cmake

@@ -14,7 +14,7 @@
 #
 #   XSLT::XSLT   - The XSLT library
 
-find_package(LibXml2 REQUIRED)
+find_package(LibXml2 QUIET)
 
 if(PKG_CONFIG_FOUND)
   pkg_check_modules(PC_XSLT libxslt QUIET)
@@ -29,7 +29,7 @@ set(XSLT_VERSION ${PC_XSLT_VERSION})
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(XSLT
-                                  REQUIRED_VARS XSLT_LIBRARY XSLT_INCLUDE_DIR
+                                  REQUIRED_VARS XSLT_LIBRARY XSLT_INCLUDE_DIR LIBXML2_FOUND
                                   VERSION_VAR XSLT_VERSION)
 
 if(XSLT_FOUND)

cmake/scripts/common/HandleDepends.cmake

@@ -47,14 +47,17 @@ function(add_addon_depends addon searchpath)
         set(url "")
         if(deflength GREATER 1)
           list(GET def 1 url)
+          if(NOT url MATCHES "^https?://")
+            set(url "http://mirrors.kodi.tv/build-deps/sources/${url}")
+          endif()
           message(STATUS "${id} url: ${url}")
         endif()
 
         # check if there are any library specific flags that need to be passed on
         if(EXISTS ${dir}/flags.txt)
           set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${dir}/flags.txt)
           file(STRINGS ${dir}/flags.txt extraflags)
-          string(REPLACE " " ";" extraflags ${extraflags})
+          string(REPLACE " " ";" extraflags "${extraflags}")
 
           message(STATUS "${id} extraflags: ${extraflags}")
         endif()
@@ -90,6 +93,10 @@ function(add_addon_depends addon searchpath)
           message(${BUILD_ARGS})
         endif()
 
+        if(TARBALL_DIR)
+          list(APPEND BUILD_ARGS -DTARBALL_DIR=${TARBALL_DIR})
+        endif()
+
         # used for addons where need special folders to store there content (if
         # not set the addon define it byself).
         # e.g. Google Chromium addon where his git bring:
@@ -231,13 +238,13 @@ function(add_addon_depends addon searchpath)
                                     -DCMAKE_INCLUDE_PATH=${OUTPUT_DIR}/include)
             endif()
 
-            set(DOWNLOAD_DIR ${BUILD_DIR}/download)
+            file(TO_CMAKE_PATH ${BUILD_DIR}/download DOWNLOAD_DIR)
             if(EXISTS ${dir}/${id}.sha256)
               file(STRINGS ${dir}/${id}.sha256 sha256sum)
               list(GET sha256sum 0 sha256sum)
               set(URL_HASH_COMMAND URL_HASH SHA256=${sha256sum})
               if(TARBALL_DIR)
-                set(DOWNLOAD_DIR ${TARBALL_DIR})
+                file(TO_CMAKE_PATH ${TARBALL_DIR} DOWNLOAD_DIR)
               endif()
             else()
               unset(URL_HASH_COMMAND)

cmake/scripts/windows/ArchSetup.cmake

@@ -33,10 +33,10 @@ set(DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/${ARCH})
 set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/${ARCH})
 
 # mingw libs
-list(APPEND CMAKE_PREFIX_PATH ${MINGW_LIBS_DIR})
+list(INSERT CMAKE_PREFIX_PATH 0 ${MINGW_LIBS_DIR})
 list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin)
 # dependencies
-list(PREPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR})
+list(INSERT CMAKE_PREFIX_PATH 1 ${DEPENDENCIES_DIR})
 
 # -------- Compiler options ---------
 

cmake/scripts/windows/Install.cmake

@@ -0,0 +1 @@
+configure_file(project/Win32BuildSetup/AppxManifest.xml.in AppxManifest.xml)

cmake/scripts/windowsstore/ArchSetup.cmake

@@ -43,16 +43,6 @@ set(CMAKE_SYSTEM_NAME WindowsStore)
 set(CORE_SYSTEM_NAME "windowsstore")
 set(PACKAGE_GUID "281d668b-5739-4abd-b3c2-ed1cda572ed2")
 set(APP_MANIFEST_NAME package.appxmanifest)
-set(DEPS_FOLDER_RELATIVE project/BuildDependencies)
-
-set(DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/win10-${ARCH})
-set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/win10-${ARCH})
-
-# mingw libs
-list(APPEND CMAKE_PREFIX_PATH ${MINGW_LIBS_DIR})
-list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin)
-# dependencies
-list(PREPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR})
 
 
 # -------- Compiler options ---------
@@ -67,11 +57,10 @@ if(NOT SDK_TARGET_ARCH STREQUAL arm)
   list(APPEND ARCH_DEFINES -D__SSE__ -D__SSE2__)
 endif()
 set(SYSTEM_DEFINES -DWIN32_LEAN_AND_MEAN -DNOMINMAX -DHAS_DX -D__STDC_CONSTANT_MACROS
-                   -DTAGLIB_STATIC -DNPT_CONFIG_ENABLE_LOGGING
+                   -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"
                    -DUNICODE -D_UNICODE
-                   -DFRIBIDI_STATIC
                    $<$<CONFIG:Debug>:-DD3D_DEBUG_INFO>)
 
 # Additional SYSTEM_DEFINES
@@ -86,11 +75,6 @@ set(gtest_force_shared_crt ON CACHE STRING "" FORCE)
 
 # -------- Linker options ---------
 
-# For #pragma comment(lib X)
-# TODO: It would certainly be better to handle these libraries via CMake modules.
-link_directories(${MINGW_LIBS_DIR}/lib
-                 ${DEPENDENCIES_DIR}/lib)
-
 list(APPEND DEPLIBS bcrypt.lib d3d11.lib WS2_32.lib dxguid.lib dloadhelper.lib WindowsApp.lib)
 
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /WINMD:NO")

cmake/scripts/windowsstore/Macros.cmake

@@ -111,22 +111,6 @@ macro(add_deployment_content_group path link match exclude)
 endmacro()
 
 macro(winstore_append_props target)
-  # exclude debug dlls from packaging
-  set(DEBUG_DLLS zlibd.dll)
-  foreach(_dll ${DEBUG_DLLS})
-    if (DEBUG_DLLS_EXCLUDE)
-      list(APPEND DEBUG_DLLS_EXCLUDE "\;$(BuildRootPath)/dlls/${_dll}")
-    else()
-      list(APPEND DEBUG_DLLS_EXCLUDE "$(BuildRootPath)/dlls/${_dll}")
-    endif()
-    string(CONCAT DEBUG_DLLS_LINKAGE_PROPS "${DEBUG_DLLS_LINKAGE_PROPS}"
-    "  <ItemGroup Label=\"Binaries\">\n"
-    "    <None Include=\"$(BinPath)\\${_dll}\" Condition=\"'$(Configuration)'=='Debug'\">\n"
-    "      <DeploymentContent>true</DeploymentContent>\n"
-    "    </None>\n"
-    "  </ItemGroup>\n")
-  endforeach(_dll DEBUG_DLLS)
-
   add_deployment_content_group($(BuildRootPath)/dlls "" *.dll "${DEBUG_DLLS_EXCLUDE}")
   add_deployment_content_group($(BuildRootPath)/system system **/* "$(BuildRootPath)/**/shaders/**")
   add_deployment_content_group($(BuildRootPath)/system/shaders system/shaders **/*.fx "")
@@ -148,7 +132,6 @@ macro(winstore_append_props target)
   endforeach()
 
   set(VCPROJECT_PROPS_FILE "${CMAKE_CURRENT_BINARY_DIR}/${target}.props")
-  file(TO_NATIVE_PATH ${DEPENDENCIES_DIR} DEPENDENCIES_DIR_NATIVE)
   file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR} CMAKE_CURRENT_BINARY_DIR_NATIVE)
   file(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR}/project/Win32BuildSetup/BUILD_WIN32/addons BINARY_ADDONS_DIR_NATIVE)
 
@@ -157,7 +140,6 @@ macro(winstore_append_props target)
     "<Project ToolsVersion=\"4.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n"
     "  <ImportGroup Label=\"PropertySheets\" />\n"
     "  <PropertyGroup Label=\"APP_DLLS\">\n"
-    "    <BinPath>${DEPENDENCIES_DIR_NATIVE}\\bin</BinPath>\n"
     "    <BuildRootPath>${CMAKE_CURRENT_BINARY_DIR_NATIVE}</BuildRootPath>\n"
     "    <BinaryAddonsPath>${BINARY_ADDONS_DIR_NATIVE}</BinaryAddonsPath>\n"
     "  </PropertyGroup>\n"

docs/README.Windows.md

@@ -47,9 +47,11 @@ Several different strategies are used to draw your attention to certain pieces o
 ## 2. Prerequisites
 To build Kodi:
 * **[CMake](https://cmake.org/download/)** (version 3.15 or greater is required)
+* **[Doxygen](www.doxygen.org/download.html)** (Only needed if you want to generate the documentation)
 * **[Git for Windows](https://gitforwindows.org/)**
 * **[Java Runtime Environment (JRE)](http://www.oracle.com/technetwork/java/javase/downloads/index.html)**
 * **[Nullsoft scriptable install system (NSIS)](http://nsis.sourceforge.net/Download)** (Only needed if you want to generate an installer file)
+* **[Perl](https://www.perl.org/get.html)**
 * **[Visual Studio 2019](https://visualstudio.microsoft.com/downloads/)** or **[Visual Studio 2017](https://visualstudio.microsoft.com/vs/older-downloads/)** (Community Edition is fine)
 
 To run Kodi you need a relatively recent CPU with integrated GPU or discrete GPU with up-to-date graphics device-drivers installed from the manufacturer's website.
@@ -135,6 +137,12 @@ Kodi can be built as either a normal 32bit or 64bit program, UWP 32bit and 64bit
 
 **TIP:** Look for comments starting with `Or ...` and only execute the command(s) you need.
 
+Build native dependencies:
+```
+cd %userprofile%\kodi\tools\buildsteps\windows
+make-native-depends.bat
+```
+
 Change to the 64bit build directory (**recommended**):
 ```
 cd %userprofile%\kodi\tools\buildsteps\windows\x64
@@ -160,6 +168,7 @@ Or change to the UWP ARM 32bit build directory:
 cd %userprofile%\kodi\tools\buildsteps\windows\arm-uwp
 ```
 
+### Prepare dependencies for 64bit
 Download dependencies:
 ```
 download-dependencies.bat
@@ -176,6 +185,12 @@ Build FFmpeg:
 make-mingwlibs.bat
 ```
 
+### Prepare dependencies for everything else
+Build target dependencies:
+```
+make-target-depends.bat
+```
+
 **[back to top](#table-of-contents)** | **[back to section top](#4-set-up-the-build-environment)**
 
 ## 5. Build Kodi automagically
@@ -224,27 +239,27 @@ cd kodi-build
 
 Configure build for 64bit (**recommended**):
 ```
-cmake -G "Visual Studio 16 2019" -A x64 -T host=x64 %userprofile%\kodi
+cmake -G "Visual Studio 16 2019" -A x64 -T host=x64 -DCMAKE_PREFIX_PATH=%userprofile%\kodi\tools\depends\xbmc-depends\x86_64-windows-native %userprofile%\kodi
 ```
 
 Or configure build for 32bit:
 ```
-cmake -G "Visual Studio 16 2019" -A Win32 -T host=x64 %userprofile%\kodi
+cmake -G "Visual Studio 16 2019" -A Win32 -T host=x64 -DCMAKE_TOOLCHAIN_FILE=%userprofile%\kodi\tools\depends\xbmc-depends\x86-windows-Debug\Toolchain.cmake %userprofile%\kodi
 ```
 
 Or configure build for UWP 64bit:
 ```
-cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 -T host=x64 %userprofile%\kodi
+cmake -G "Visual Studio 16 2019" -A x64 -T host=x64 -DCMAKE_TOOLCHAIN_FILE=%userprofile%\kodi\tools\depends\xbmc-depends\x86_64-windowsstore-Debug\Toolchain.cmake %userprofile%\kodi
 ```
 
 Or configure build for UWP 32bit:
 ```
-cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 -T host=x64 %userprofile%\kodi
+cmake -G "Visual Studio 16 2019" -A Win32 -T host=x64 -DCMAKE_TOOLCHAIN_FILE=%userprofile%\kodi\tools\depends\xbmc-depends\x86-windowsstore-Debug\Toolchain.cmake %userprofile%\kodi
 ```
 
 Or configure build for UWP ARM 32bit:
 ```
-cmake -G "Visual Studio 16 2019" -A ARM -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 -T host=x64 %userprofile%\kodi
+cmake -G "Visual Studio 16 2019" -A ARM -T host=x64 -DCMAKE_TOOLCHAIN_FILE=%userprofile%\kodi\tools\depends\xbmc-depends\arm-windowsstore-Debug\Toolchain.cmake %userprofile%\kodi
 ```
 
 **Visual Studio 2017:**