diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-06-17 19:51:55 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-06-17 22:22:43 +1000 |
| commit | fea9720700c30db64c120342f72d08905dbf9dc4 (patch) | |
| tree | b246fa4826eb329534c0c498f15952d61192a00d | |
| parent | 56279cbd3cc458f54911236d12d5205311093b70 (diff) | |
[cmake] windows create NATIVEPREFIX variable
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | cmake/scripts/windows/ArchSetup.cmake | 1 | ||||
| -rw-r--r-- | cmake/scripts/windowsstore/ArchSetup.cmake | 1 | ||||
| -rw-r--r-- | tools/buildsteps/windows/prepare-env.bat | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 9365749559..818928340c 100644 --- a/.gitignore +++ b/.gitignore @@ -217,6 +217,7 @@ cmake_install.cmake /project/BuildDependencies/build /project/BuildDependencies/scripts/tmp /project/BuildDependencies/src +/project/BuildDependencies/tools /project/BuildDependencies/bin/swig /project/BuildDependencies/bin/doxygen /project/BuildDependencies/bin/json-rpc diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake index dfe53bf76a..0c432a2daf 100644 --- a/cmake/scripts/windows/ArchSetup.cmake +++ b/cmake/scripts/windows/ArchSetup.cmake @@ -29,6 +29,7 @@ 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) set(DEPENDENCIES_DIR ${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 b31a30a346..f0d6844e99 100644 --- a/cmake/scripts/windowsstore/ArchSetup.cmake +++ b/cmake/scripts/windowsstore/ArchSetup.cmake @@ -45,6 +45,7 @@ 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) set(DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/win10-${ARCH}) set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/win10-${ARCH}) diff --git a/tools/buildsteps/windows/prepare-env.bat b/tools/buildsteps/windows/prepare-env.bat index 25e65b8b8a..abafafbfdd 100644 --- a/tools/buildsteps/windows/prepare-env.bat +++ b/tools/buildsteps/windows/prepare-env.bat @@ -14,7 +14,7 @@ rem we assume git in path as this is a requirement rem git clean the untracked files and directories rem but keep the downloaded dependencies rem also keeps MSYS2 installation -SET GIT_CLEAN_CMD=git clean -xffd -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" -e "project/BuildDependencies/mingwlibs" -e "project/BuildDependencies/msys64" +SET GIT_CLEAN_CMD=git clean -xffd -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" -e "project/BuildDependencies/mingwlibs" -e "project/BuildDependencies/msys64" -e "project/BuildDependencies/tools" ECHO running %GIT_CLEAN_CMD% %GIT_CLEAN_CMD% |