From 404aa1bdb27598368d14e9f020de251e8df896bc Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Thu, 7 Aug 2025 15:10:02 +0100 Subject: [PATCH] Just build all (now guarded) architecture specific vm_* --- cmake/shared_sources.cmake | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/cmake/shared_sources.cmake b/cmake/shared_sources.cmake index 551315b6..89e893a1 100644 --- a/cmake/shared_sources.cmake +++ b/cmake/shared_sources.cmake @@ -1,7 +1,6 @@ include_guard(GLOBAL) include(utils/add_git_dependency) -include(utils/arch) include(utils/disable_warnings) set(COMMON_SOURCES @@ -25,7 +24,11 @@ set(COMMON_SOURCES ${SOURCE_DIR}/qcommon/unzip.c ${SOURCE_DIR}/qcommon/ioapi.c ${SOURCE_DIR}/qcommon/vm.c + ${SOURCE_DIR}/qcommon/vm_armv7l.c ${SOURCE_DIR}/qcommon/vm_interpreted.c + ${SOURCE_DIR}/qcommon/vm_powerpc.c + ${SOURCE_DIR}/qcommon/vm_sparc.c + ${SOURCE_DIR}/qcommon/vm_x86.c ) disable_warnings( @@ -35,24 +38,6 @@ disable_warnings( add_git_dependency(${SOURCE_DIR}/qcommon/common.c) -if(ARCH MATCHES "x86" OR ARCH MATCHES "x86_64") - list(APPEND COMMON_SOURCES - ${SOURCE_DIR}/qcommon/vm_x86.c - ) -elseif(ARCH MATCHES "ppc" OR ARCH MATCHES "ppc64") - list(APPEND COMMON_SOURCES - ${SOURCE_DIR}/qcommon/vm_powerpc.c - ) -elseif(ARCH MATCHES "arm") - list(APPEND COMMON_SOURCES - ${SOURCE_DIR}/qcommon/vm_armv7l.c - ) -elseif(ARCH MATCHES "sparc") - list(APPEND COMMON_SOURCES - ${SOURCE_DIR}/qcommon/vm_sparc.c - ) -endif() - set(SYSTEM_SOURCES ${SOURCE_DIR}/sys/con_log.c ${SOURCE_DIR}/sys/sys_autoupdater.c