From 3aee97dfabced77fa064fc83cf26bd680a8c1ab4 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Fri, 22 Aug 2025 18:38:46 +0100 Subject: [PATCH] Fix GCC x86 build --- Makefile | 4 ++-- cmake/compilers/gnu.cmake | 4 +++- code/asm/{matha.s => matha.S} | 0 code/asm/{snd_mixa.s => snd_mixa.S} | 0 4 files changed, 5 insertions(+), 3 deletions(-) rename code/asm/{matha.s => matha.S} (100%) rename code/asm/{snd_mixa.s => snd_mixa.S} (100%) diff --git a/Makefile b/Makefile index 8b610ea5..0fa793cd 100644 --- a/Makefile +++ b/Makefile @@ -2881,7 +2881,7 @@ $(B)/$(MISSIONPACK)/vm/ui.qvm: $(MPUIVMOBJ) $(UIDIR)/ui_syscalls.asm $(Q3ASM) ## CLIENT/SERVER RULES ############################################################################# -$(B)/client/%.o: $(ASMDIR)/%.s +$(B)/client/%.o: $(ASMDIR)/%.S $(DO_AS) # k8 so inline assembler knows about SSE @@ -2980,7 +2980,7 @@ $(B)/renderergl2/%.o: $(RGL2DIR)/%.c $(DO_REF_CC) -$(B)/ded/%.o: $(ASMDIR)/%.s +$(B)/ded/%.o: $(ASMDIR)/%.S $(DO_AS) # k8 so inline assembler knows about SSE diff --git a/cmake/compilers/gnu.cmake b/cmake/compilers/gnu.cmake index 9a00d3e4..22238f44 100644 --- a/cmake/compilers/gnu.cmake +++ b/cmake/compilers/gnu.cmake @@ -7,8 +7,10 @@ endif() enable_language(ASM) set(ASM_SOURCES - ${SOURCE_DIR}/asm/snapvector.c ${SOURCE_DIR}/asm/ftola.c + ${SOURCE_DIR}/asm/matha.S + ${SOURCE_DIR}/asm/snapvector.c + ${SOURCE_DIR}/asm/snd_mixa.S ) add_compile_options(-Wall -Wimplicit diff --git a/code/asm/matha.s b/code/asm/matha.S similarity index 100% rename from code/asm/matha.s rename to code/asm/matha.S diff --git a/code/asm/snd_mixa.s b/code/asm/snd_mixa.S similarity index 100% rename from code/asm/snd_mixa.s rename to code/asm/snd_mixa.S