diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-06-21 15:59:10 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-06-21 18:11:37 +1000 |
| commit | 5e3f4adfe2f7c56e2dffbcb50dd890620731809c (patch) | |
| tree | abfb77de2124a3b4384d0040f6be667914742eab /cmake/scripts/windows | |
| parent | dd0d15da84620cb314bc308ff56f06364c4945c6 (diff) | |
[cmake] standardise on DEPENDS_PATH for all platforms
windows used a different name, so bring it inline with other platforms
Diffstat (limited to 'cmake/scripts/windows')
| -rw-r--r-- | cmake/scripts/windows/ArchSetup.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake index 29f9f1c731..01c885180a 100644 --- a/cmake/scripts/windows/ArchSetup.cmake +++ b/cmake/scripts/windows/ArchSetup.cmake @@ -36,14 +36,12 @@ 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(DEPENDS_PATH ${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(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin) -# dependencies -list(PREPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}) if(NOT TARBALL_DIR) set(TARBALL_DIR "${CMAKE_SOURCE_DIR}/project/BuildDependencies/downloads") @@ -79,7 +77,7 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") # For #pragma comment(lib X) # TODO: It would certainly be better to handle these libraries via CMake modules. -link_directories(${DEPENDENCIES_DIR}/lib) +link_directories(${DEPENDS_PATH}/lib) # Additional libraries list(APPEND DEPLIBS bcrypt.lib d3d11.lib DInput8.lib DSound.lib winmm.lib Mpr.lib Iphlpapi.lib WS2_32.lib |