From 226ae08d0a5425b13b7b6c05049f7ee239bc6f56 Mon Sep 17 00:00:00 2001 From: Lance Date: Mon, 8 Jun 2009 08:10:32 +0000 Subject: [PATCH] Use -DCLANG with clang (sv_rankin.c hotfix), Makefile cleanup (cleaner filenames) and -D_SDL added to the win32_SDL targets git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3215 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 9 +++++---- engine/server/sv_rankin.c | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index 3cfc8eaa7..f05cbf2b0 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -244,7 +244,7 @@ ifeq ($(FTE_TARGET),win32) RELEASE_CFLAGS=-fno-strict-aliasing -ffast-math -fexpensive-optimizations $(CPUOPTIMIZATIONS) endif ifeq ($(FTE_TARGET),win32_SDL) - RELEASE_CFLAGS=-fno-strict-aliasing -ffast-math -fexpensive-optimizations $(CPUOPTIMIZATIONS) + RELEASE_CFLAGS=-fno-strict-aliasing -ffast-math -fexpensive-optimizations $(CPUOPTIMIZATIONS) -D_SDL endif RELEASE_CFLAGS ?= -O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS) #RELEASE_CFLAGS=-O6 -fno-strict-aliasing -ffast-math -funroll-loops -fexpensive-optimizations $(CPUOPTIMIZATIONS) @@ -508,7 +508,7 @@ SWB_DIR=sw_sdl$(BITS) SWCL_DIR=swcl_sdl$(BITS) SV_OBJS=$(COMMON_OBJS) $(SERVER_OBJS) $(PROGS_OBJS) $(SERVERONLY_OBJS) -SV_EXE_NAME=../fteqw.sv$(BITS) +SV_EXE_NAME=../fteqw_sdl.sv$(BITS) SV_CFLAGS=$(SERVER_ONLY_CFLAGS) -lz MINGL_DIR=mingl_sdl$(BITS) @@ -560,8 +560,8 @@ ifeq ($(FTE_TARGET),win32_SDL) SWCL_DIR=swcl_mgw_sdl$(BITS) SV_OBJS=$(COMMON_OBJS) $(SERVER_OBJS) $(PROGS_OBJS) $(WINDOWSSERVERONLY_OBJS) resources.o - SV_EXE_NAME=../fteqw_sv.exe - SV_CFLAGS=$(SERVER_ONLY_CFLAGS) + SV_EXE_NAME=../fteqw_sdl_sv.exe + SV_CFLAGS=$(SERVER_ONLY_CFLAGS) -D_SDL SV_LDFLAGS=./libs/mingw-libs/libz.a -lm -lmingw32 -lwsock32 -lwinmm MINGL_DIR=mingl_sdl$(BITS) @@ -708,6 +708,7 @@ ifneq ($(shell echo $(FTE_TARGET)|grep linux),) SV_DIR=sv_linux$(BITS) SV_LDFLAGS=-lz + SV_EXE_NAME=../fteqw.sv$(BITS) GLCL_OBJS=$(GL_OBJS) $(GLQUAKE_OBJS) gl_vidlinuxglx.o snd_linux.o snd_alsa.oo cd_linux.o sys_linux.o ifeq ($(USEASM),true) diff --git a/engine/server/sv_rankin.c b/engine/server/sv_rankin.c index 8eb7c4aa5..1f7cd8050 100644 --- a/engine/server/sv_rankin.c +++ b/engine/server/sv_rankin.c @@ -4,6 +4,8 @@ #if defined(_WIN32) && !defined(MINGW) #define inline //_inline //fix for stupid VC +#elif defined(CLANG) +#define inline // fix for stupid clang #endif #ifdef SVRANKING