okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make client/server cflags configurable

Browse source
This commit is contained in:
Thilo Schulz 2011-08-01 12:48:31 +00:00
parent b151d91777
commit 6713bbbab3
1 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Makefile
View file

@ -274,8 +274,7 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-pipe -DUSE_ICON -pipe -DUSE_ICON
CLIENT_CFLAGS = $(SDL_CFLAGS) CLIENT_CFLAGS += $(SDL_CFLAGS)
SERVER_CFLAGS =
ifeq ($(USE_OPENAL),1) ifeq ($(USE_OPENAL),1)
CLIENT_CFLAGS += -DUSE_OPENAL CLIENT_CFLAGS += -DUSE_OPENAL
@ -396,8 +395,6 @@ ifeq ($(PLATFORM),darwin)
OPTIMIZEVM= OPTIMIZEVM=
BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
CLIENT_CFLAGS =
SERVER_CFLAGS =
ifeq ($(ARCH),ppc) ifeq ($(ARCH),ppc)
BASE_CFLAGS += -faltivec BASE_CFLAGS += -faltivec
@ -487,8 +484,6 @@ ifeq ($(PLATFORM),mingw32)
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-DUSE_ICON -DUSE_ICON
CLIENT_CFLAGS =
SERVER_CFLAGS =
# In the absence of wspiapi.h, require Windows XP or later # In the absence of wspiapi.h, require Windows XP or later
ifeq ($(shell test -e $(CMDIR)/wspiapi.h; echo $$?),1) ifeq ($(shell test -e $(CMDIR)/wspiapi.h; echo $$?),1)
@ -535,7 +530,7 @@ ifeq ($(PLATFORM),mingw32)
BINEXT=.exe BINEXT=.exe
LIBS= -lws2_32 -lwinmm -lpsapi LIBS= -lws2_32 -lwinmm -lpsapi
CLIENT_LDFLAGS = -mwindows CLIENT_LDFLAGS += -mwindows
CLIENT_LIBS = -lgdi32 -lole32 -lopengl32 CLIENT_LIBS = -lgdi32 -lole32 -lopengl32
ifeq ($(USE_CURL),1) ifeq ($(USE_CURL),1)
@ -596,8 +591,7 @@ ifeq ($(PLATFORM),freebsd)
BASE_CFLAGS = $(shell env MACHINE_ARCH=$(ARCH) make -f /dev/null -VCFLAGS) \ BASE_CFLAGS = $(shell env MACHINE_ARCH=$(ARCH) make -f /dev/null -VCFLAGS) \
-Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
CLIENT_CFLAGS = $(SDL_CFLAGS) CLIENT_CFLAGS += $(SDL_CFLAGS)
SERVER_CFLAGS =
HAVE_VM_COMPILED = true HAVE_VM_COMPILED = true
OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer
@ -662,8 +656,7 @@ ifeq ($(PLATFORM),openbsd)
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
CLIENT_CFLAGS = $(SDL_CFLAGS) CLIENT_CFLAGS += $(SDL_CFLAGS)
SERVER_CFLAGS =
ifeq ($(USE_OPENAL),1) ifeq ($(USE_OPENAL),1)
CLIENT_CFLAGS += -DUSE_OPENAL CLIENT_CFLAGS += -DUSE_OPENAL
@ -732,8 +725,6 @@ ifeq ($(PLATFORM),netbsd)
THREAD_LIBS=-lpthread THREAD_LIBS=-lpthread
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
CLIENT_CFLAGS =
SERVER_CFLAGS =
ifneq ($(ARCH),i386) ifneq ($(ARCH),i386)
BASE_CFLAGS += -DNO_VM_COMPILED BASE_CFLAGS += -DNO_VM_COMPILED
@ -757,7 +748,7 @@ ifeq ($(PLATFORM),irix64)
BASE_CFLAGS=-Dstricmp=strcasecmp -Xcpluscomm -woff 1185 \ BASE_CFLAGS=-Dstricmp=strcasecmp -Xcpluscomm -woff 1185 \
-I. -I$(ROOT)/usr/include -DNO_VM_COMPILED -I. -I$(ROOT)/usr/include -DNO_VM_COMPILED
CLIENT_CFLAGS = $(SDL_CFLAGS) CLIENT_CFLAGS += $(SDL_CFLAGS)
OPTIMIZE = -O3 OPTIMIZE = -O3
SHLIBEXT=so SHLIBEXT=so
@ -797,8 +788,7 @@ ifeq ($(PLATFORM),sunos)
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-pipe -DUSE_ICON -pipe -DUSE_ICON
CLIENT_CFLAGS = $(SDL_CFLAGS) CLIENT_CFLAGS += $(SDL_CFLAGS)
SERVER_CFLAGS =
OPTIMIZEVM = -O3 -funroll-loops OPTIMIZEVM = -O3 -funroll-loops