From d753d477586a78cbe507ece7575afc841e201199 Mon Sep 17 00:00:00 2001 From: TimeServ Date: Fri, 17 Jul 2009 10:17:22 +0000 Subject: [PATCH] fix "merged" sdl git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3284 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index f076d4850..ee6cae640 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -470,7 +470,7 @@ MINGL_EXE_NAME=../fteqw_sdl.mingl$(BITS) MB_DIR=m_sdl$(BITS) M_EXE_NAME=../fteqw_sdl$(BITS) -MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) gl_vidsdl.o vid_sdl.o snd_sdl.o cd_sdl.o sys_sdl.o in_sdl.o +MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) gl_vidsdl.o snd_sdl.o cd_sdl.o sys_sdl.o in_sdl.o M_CFLAGS=$(GLCFLAGS) `sdl-config --cflags` -D_MERGED_SDL M_LDFLAGS=$(GLLDFLAGS) $(IMAGELDFLAGS) @@ -510,7 +510,7 @@ ifeq ($(FTE_TARGET),win32_SDL) MB_DIR=m_mgw_sdl$(BITS) M_EXE_NAME=../fteqw_sdl.exe - MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) gl_vidsdl.o vid_sdl.o snd_sdl.o cd_sdl.o sys_sdl.o in_sdl.o snd_directx.o resources.o + MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) gl_vidsdl.o snd_sdl.o cd_sdl.o sys_sdl.o in_sdl.o snd_directx.o resources.o M_CFLAGS=-D_MINGW_VFPRINTF -D_SDL -I./libs/ -I./libs/mingw-libs/ -I./libs/dxsdk7/include/ -I./libs/mingw-libs $(GLCFLAGS) `sdl-config --cflags` -D_MERGED_SDL M_LDFLAGS=$(GLLDFLAGS) $(IMAGELDFLAGS)