From 0e53cfde93215072a0510685db63a3ac5b28f3f3 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sat, 30 Aug 2025 19:08:12 +0100
Subject: [PATCH] Fix QVM tool dependencies on Windows

---
 cmake/platforms/windows.cmake | 5 +++++
 cmake/utils/qvm_tools.cmake   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cmake/platforms/windows.cmake b/cmake/platforms/windows.cmake
index f44c1a30..30b3f7cc 100644
--- a/cmake/platforms/windows.cmake
+++ b/cmake/platforms/windows.cmake
@@ -37,3 +37,8 @@ if(MSVC)
 endif()
 
 set(CLIENT_EXECUTABLE_OPTIONS WIN32)
+
+# It's only necessary to set this on Windows; elsewhere
+# CMAKE_EXECUTABLE_SUFFIX will be empty anyway, or we want
+# HOST_EXECUTABLE_SUFFIX to be empty for other reasons
+set(HOST_EXECUTABLE_SUFFIX ${CMAKE_EXECUTABLE_SUFFIX})
diff --git a/cmake/utils/qvm_tools.cmake b/cmake/utils/qvm_tools.cmake
index d8e6729c..6000eb87 100644
--- a/cmake/utils/qvm_tools.cmake
+++ b/cmake/utils/qvm_tools.cmake
@@ -12,8 +12,8 @@ if(CMAKE_BUILD_TYPE)
     set(BUILD_TYPE_ARG -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
 endif()
 
-set(Q3LCC ${TOOLS_DIR}/$<CONFIG>/q3lcc)
-set(Q3ASM ${TOOLS_DIR}/$<CONFIG>/q3asm)
+set(Q3LCC ${TOOLS_DIR}/$<CONFIG>/q3lcc${HOST_EXECUTABLE_SUFFIX})
+set(Q3ASM ${TOOLS_DIR}/$<CONFIG>/q3asm${HOST_EXECUTABLE_SUFFIX})
 
 ExternalProject_Add(qvm_tools
     SOURCE_DIR ${CMAKE_SOURCE_DIR}/cmake/tools