diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2023-06-19 16:57:08 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-19 16:57:08 +1000 |
| commit | 0a207c65ce2b83e67a882625a18dc6b9a0cbef74 (patch) | |
| tree | 12f27f85e4ebce54926d0202113eb2067dbeb60d /cmake/scripts | |
| parent | 2a2bbd014883944b1909801ba5d3a252ca81a656 (diff) | |
| parent | 325b5599388f3381d97ecf583412e01cef1f2094 (diff) | |
Merge pull request #23409 from fuzzard/windows_buildscriptsfix
[windows] Distinguish between host/native download/tools for windows build
Diffstat (limited to 'cmake/scripts')
| -rw-r--r-- | cmake/scripts/windows/ArchSetup.cmake | 5 | ||||
| -rw-r--r-- | cmake/scripts/windowsstore/ArchSetup.cmake | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake index f0f8a085b5..c61563b18f 100644 --- a/cmake/scripts/windows/ArchSetup.cmake +++ b/cmake/scripts/windows/ArchSetup.cmake @@ -35,7 +35,10 @@ set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/win32/WinMain.cpp) set(PRECOMPILEDHEADER_DIR ${PROJECT_BINARY_DIR}/${CORE_BUILD_CONFIG}/objs) set(CMAKE_SYSTEM_NAME Windows) set(DEPS_FOLDER_RELATIVE project/BuildDependencies) -set(NATIVEPREFIX ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/tools) +# 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(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 c458479097..ff18e4a6d4 100644 --- a/cmake/scripts/windowsstore/ArchSetup.cmake +++ b/cmake/scripts/windowsstore/ArchSetup.cmake @@ -51,7 +51,10 @@ set(PACKAGE_GUID "281d668b-5739-4abd-b3c2-ed1cda572ed2") set(APP_MANIFEST_NAME package.appxmanifest) set(DEPS_FOLDER_RELATIVE project/BuildDependencies) -set(NATIVEPREFIX ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/tools) +# 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(DEPENDS_PATH ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/win10-${ARCH}) set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/win10-${ARCH}) |