eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Use -DCLANG with clang (sv_rankin.c hotfix), Makefile cleanup (cleaner filenames) and -D_SDL added to the

Browse source 
win32_SDL 
targets


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3215 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Lance 2009-06-08 08:10:32 +00:00
parent e9c0883937
commit 226ae08d0a
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
engine/Makefile
View file

@ -244,7 +244,7 @@ ifeq ($(FTE_TARGET),win32)
RELEASE_CFLAGS=-fno-strict-aliasing -ffast-math -fexpensive-optimizations $(CPUOPTIMIZATIONS) RELEASE_CFLAGS=-fno-strict-aliasing -ffast-math -fexpensive-optimizations $(CPUOPTIMIZATIONS)
endif endif
ifeq ($(FTE_TARGET),win32_SDL) 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 endif
RELEASE_CFLAGS ?= -O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS) RELEASE_CFLAGS ?= -O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
#RELEASE_CFLAGS=-O6 -fno-strict-aliasing -ffast-math -funroll-loops -fexpensive-optimizations $(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) SWCL_DIR=swcl_sdl$(BITS)
SV_OBJS=$(COMMON_OBJS) $(SERVER_OBJS) $(PROGS_OBJS) $(SERVERONLY_OBJS) 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 SV_CFLAGS=$(SERVER_ONLY_CFLAGS) -lz
MINGL_DIR=mingl_sdl$(BITS) MINGL_DIR=mingl_sdl$(BITS)
@ -560,8 +560,8 @@ ifeq ($(FTE_TARGET),win32_SDL)
SWCL_DIR=swcl_mgw_sdl$(BITS) SWCL_DIR=swcl_mgw_sdl$(BITS)
SV_OBJS=$(COMMON_OBJS) $(SERVER_OBJS) $(PROGS_OBJS) $(WINDOWSSERVERONLY_OBJS) resources.o SV_OBJS=$(COMMON_OBJS) $(SERVER_OBJS) $(PROGS_OBJS) $(WINDOWSSERVERONLY_OBJS) resources.o
SV_EXE_NAME=../fteqw_sv.exe SV_EXE_NAME=../fteqw_sdl_sv.exe
SV_CFLAGS=$(SERVER_ONLY_CFLAGS) SV_CFLAGS=$(SERVER_ONLY_CFLAGS) -D_SDL
SV_LDFLAGS=./libs/mingw-libs/libz.a -lm -lmingw32 -lwsock32 -lwinmm SV_LDFLAGS=./libs/mingw-libs/libz.a -lm -lmingw32 -lwsock32 -lwinmm
MINGL_DIR=mingl_sdl$(BITS) MINGL_DIR=mingl_sdl$(BITS)
@ -708,6 +708,7 @@ ifneq ($(shell echo $(FTE_TARGET)|grep linux),)
SV_DIR=sv_linux$(BITS) SV_DIR=sv_linux$(BITS)
SV_LDFLAGS=-lz 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 GLCL_OBJS=$(GL_OBJS) $(GLQUAKE_OBJS) gl_vidlinuxglx.o snd_linux.o snd_alsa.oo cd_linux.o sys_linux.o
ifeq ($(USEASM),true) ifeq ($(USEASM),true)

2
engine/server/sv_rankin.c
View file

@ -4,6 +4,8 @@
#if defined(_WIN32) && !defined(MINGW) #if defined(_WIN32) && !defined(MINGW)
#define inline //_inline //fix for stupid VC #define inline //_inline //fix for stupid VC
#elif defined(CLANG)
#define inline // fix for stupid clang
#endif #endif
#ifdef SVRANKING #ifdef SVRANKING