From 52e672d03486dd38ecc7477ef29482bb91514bdf Mon Sep 17 00:00:00 2001 From: erysdren Date: Wed, 28 Aug 2024 01:50:12 -0500 Subject: [PATCH] Fix makefile for linux->win64_SDL target (#258) Co-authored-by: eukara --- engine/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index 346a267f0..c692c009a 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -1186,11 +1186,10 @@ ifeq (win_SDL,$(findstring win,$(FTE_TARGET))$(findstring _SDL,$(FTE_TARGET))) EXEPOSTFIX=.exe - CC_MACHINE:=$(shell $(CC) -dumpmachine) - ARCH_PREDEP=$(BASE_DIR)/libs-$(ARCH)/SDL2-$(SDL2VER)/$(CC_MACHINE)/bin/sdl2-config - SDLCONFIG=$(ARCH_PREDEP) --prefix=$(BASE_DIR)/libs-$(ARCH)/SDL2-$(SDL2VER)/$(CC_MACHINE) + ARCH_PREDEP=$(BASE_DIR)/libs-$(ARCH)/SDL2-$(SDL2VER)/$(ARCH)/bin/sdl2-config + SDLCONFIG=$(ARCH_PREDEP) --prefix=$(BASE_DIR)/libs-$(ARCH)/SDL2-$(SDL2VER)/$(ARCH) CLIENTLIBFLAGS+=`$(SDLCONFIG) --cflags` - + #the defaults for sdl come first GLCL_OBJS=$(GL_OBJS) $(D3DGL_OBJS) $(GLQUAKE_OBJS) gl_vidsdl.o snd_sdl.o cd_sdl.o sys_sdl.o in_sdl.o snd_directx.o $(LTO_END) resources.o $(LTO_START) GL_EXE_NAME=../$(EXE_NAME)-sdl-gl$(BITS)$(EXEPOSTFIX)