diff options
| author | fuzzard <fuzzard@kodi.tv> | 2024-06-03 13:56:56 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2024-06-17 12:47:41 +1000 |
| commit | 6f766bb4d6cd4cf165ff80b17ec030e88fc7b4b9 (patch) | |
| tree | ab62d40ac663eb2a6c392f6e78c25cd7dd4185de /cmake | |
| parent | 74b6dd9074f5a0dd3ddd85abf92c5e29e15edaf0 (diff) | |
[windows] Split target platform from build tools folder location
We currently use the same folder for win32 target arch, and for the native build tools
extraction folder. We need to avoid NATIVEPREFIX being the same as DEPENDS_PATH.
For now, we can just locate the build tools to an non specific arch folder
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/scripts/windows/ArchSetup.cmake | 2 | ||||
| -rw-r--r-- | cmake/scripts/windowsstore/ArchSetup.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake index 4b00257f53..b19789d5bb 100644 --- a/cmake/scripts/windows/ArchSetup.cmake +++ b/cmake/scripts/windows/ArchSetup.cmake @@ -38,7 +38,7 @@ set(DEPS_FOLDER_RELATIVE project/BuildDependencies) # ToDo: currently host build tools are hardcoded to win32 # If we ever allow package.native other than 0_package.native-win32.list we will want to # adapt this based on host -set(NATIVEPREFIX ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/win32) +set(NATIVEPREFIX ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/tools) set(DEPENDS_PATH ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/${ARCH}) set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/${ARCH}) diff --git a/cmake/scripts/windowsstore/ArchSetup.cmake b/cmake/scripts/windowsstore/ArchSetup.cmake index 10422968b4..c3e580aa69 100644 --- a/cmake/scripts/windowsstore/ArchSetup.cmake +++ b/cmake/scripts/windowsstore/ArchSetup.cmake @@ -54,7 +54,7 @@ set(DEPS_FOLDER_RELATIVE project/BuildDependencies) # ToDo: currently host build tools are hardcoded to win32 # If we ever allow package.native other than 0_package.native-win32.list we will want to # adapt this based on host -set(NATIVEPREFIX ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/win32) +set(NATIVEPREFIX ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/tools) set(DEPENDS_PATH ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/win10-${ARCH}) set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/win10-${ARCH}) |