From c94a57ca0dae06c25dc3a0a33a81ddbf8ae2d502 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sun, 7 Sep 2025 11:27:22 +0100 Subject: [PATCH] Add q3rcc and q3cpp to dependency chain --- cmake/utils/qvm_tools.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/utils/qvm_tools.cmake b/cmake/utils/qvm_tools.cmake index 6000eb87..82e4d691 100644 --- a/cmake/utils/qvm_tools.cmake +++ b/cmake/utils/qvm_tools.cmake @@ -12,6 +12,8 @@ if(CMAKE_BUILD_TYPE) set(BUILD_TYPE_ARG -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) endif() +set(Q3RCC ${TOOLS_DIR}/$/q3rcc${HOST_EXECUTABLE_SUFFIX}) +set(Q3CPP ${TOOLS_DIR}/$/q3cpp${HOST_EXECUTABLE_SUFFIX}) set(Q3LCC ${TOOLS_DIR}/$/q3lcc${HOST_EXECUTABLE_SUFFIX}) set(Q3ASM ${TOOLS_DIR}/$/q3asm${HOST_EXECUTABLE_SUFFIX}) @@ -24,7 +26,7 @@ ExternalProject_Add(qvm_tools -DCMAKE_MINIMUM_REQUIRED_VERSION=${CMAKE_MINIMUM_REQUIRED_VERSION} ${BUILD_TYPE_ARG} BUILD_ALWAYS TRUE - BUILD_BYPRODUCTS ${Q3LCC} ${Q3ASM} + BUILD_BYPRODUCTS ${Q3RCC} ${Q3CPP} ${Q3LCC} ${Q3ASM} INSTALL_COMMAND "") function(add_qvm MODULE_NAME) @@ -67,7 +69,7 @@ function(add_qvm MODULE_NAME) add_custom_command( OUTPUT ${ASM_FILE} COMMAND ${Q3LCC} ${LCC_FLAGS} -o ${ASM_FILE} ${SOURCE} - DEPENDS ${SOURCE} qvm_tools ${Q3LCC} + DEPENDS ${SOURCE} qvm_tools ${Q3RCC} ${Q3CPP} ${Q3LCC} COMMENT "Building C object ${ASM_FILE_COMMENT}") list(APPEND ASM_FILES ${ASM_FILE})