Changeset View
Changeset View
Standalone View
Standalone View
head/games/ioquake3/files/patch-Makefile
--- Makefile.orig 2009-04-22 22:54:48.000000000 +0400 | --- Makefile.orig 2009-04-22 18:54:48 UTC | ||||
+++ Makefile 2015-09-28 20:24:27.956819000 +0300 | +++ Makefile | ||||
@@ -187,6 +187,8 @@ | @@ -187,6 +187,8 @@ ifeq ($(shell which pkg-config > /dev/nu | ||||
# FIXME: introduce CLIENT_CFLAGS | # FIXME: introduce CLIENT_CFLAGS | ||||
SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//') | SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//') | ||||
SDL_LIBS=$(shell pkg-config --libs sdl) | SDL_LIBS=$(shell pkg-config --libs sdl) | ||||
+ VORBIS_CFLAGS=$(shell pkg-config --silence-errors --cflags vorbis vorbisfile) | + VORBIS_CFLAGS=$(shell pkg-config --silence-errors --cflags vorbis vorbisfile) | ||||
+ VORBIS_LIBS=$(shell pkg-config --silence-errors --libs vorbis vorbisfile) | + VORBIS_LIBS=$(shell pkg-config --silence-errors --libs vorbis vorbisfile) | ||||
endif | endif | ||||
# version info | # version info | ||||
@@ -521,44 +523,25 @@ | @@ -521,44 +523,25 @@ else # ifeq mingw32 | ||||
ifeq ($(PLATFORM),freebsd) | ifeq ($(PLATFORM),freebsd) | ||||
- ifneq (,$(findstring alpha,$(shell uname -m))) | - ifneq (,$(findstring alpha,$(shell uname -m))) | ||||
- ARCH=axp | - ARCH=axp | ||||
- else #default to i386 | - else #default to i386 | ||||
- ARCH=i386 | - ARCH=i386 | ||||
- endif #alpha test | - endif #alpha test | ||||
▲ Show 20 Lines • Show All 46 Lines • ▼ Show 20 Lines | |||||
+ HAVE_VM_COMPILED = true | + HAVE_VM_COMPILED = true | ||||
- DEBUG_CFLAGS=$(BASE_CFLAGS) -g | - DEBUG_CFLAGS=$(BASE_CFLAGS) -g | ||||
+ OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer | + OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer | ||||
+ OPTIMIZE = $(OPTIMIZEVM) -ffast-math | + OPTIMIZE = $(OPTIMIZEVM) -ffast-math | ||||
SHLIBEXT=so | SHLIBEXT=so | ||||
SHLIBCFLAGS=-fPIC | SHLIBCFLAGS=-fPIC | ||||
@@ -568,20 +551,52 @@ | @@ -568,20 +551,52 @@ ifeq ($(PLATFORM),freebsd) | ||||
# don't need -ldl (FreeBSD) | # don't need -ldl (FreeBSD) | ||||
LIBS=-lm | LIBS=-lm | ||||
- CLIENT_LIBS = | - CLIENT_LIBS = | ||||
- | - | ||||
- CLIENT_LIBS += $(shell sdl-config --libs) -lGL | - CLIENT_LIBS += $(shell sdl-config --libs) -lGL | ||||
+ CLIENT_LIBS = $(SDL_LIBS) -lGL | + CLIENT_LIBS = $(SDL_LIBS) -lGL | ||||
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines | |||||
+ endif | + endif | ||||
+ | + | ||||
+ RELEASE_CFLAGS = $(BASE_CFLAGS) | + RELEASE_CFLAGS = $(BASE_CFLAGS) | ||||
+ DEBUG_CFLAGS = $(BASE_CFLAGS) -g | + DEBUG_CFLAGS = $(BASE_CFLAGS) -g | ||||
+ | + | ||||
else # ifeq freebsd | else # ifeq freebsd | ||||
############################################################################# | ############################################################################# | ||||
@@ -831,7 +846,7 @@ | @@ -831,7 +846,7 @@ endif | ||||
ifeq ($(USE_VOIP),1) | ifeq ($(USE_VOIP),1) | ||||
BASE_CFLAGS += -DUSE_VOIP | BASE_CFLAGS += -DUSE_VOIP | ||||
ifeq ($(USE_INTERNAL_SPEEX),1) | ifeq ($(USE_INTERNAL_SPEEX),1) | ||||
- BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include | - BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include | ||||
+ BASE_CFLAGS := -I$(SPEEXDIR)/include -DFLOATING_POINT -DUSE_ALLOCA $(BASE_CFLAGS) | + BASE_CFLAGS := -I$(SPEEXDIR)/include -DFLOATING_POINT -DUSE_ALLOCA $(BASE_CFLAGS) | ||||
else | else | ||||
CLIENT_LIBS += -lspeex | CLIENT_LIBS += -lspeex | ||||
endif | endif | ||||
@@ -1442,6 +1457,9 @@ | @@ -1442,6 +1457,9 @@ ifeq ($(HAVE_VM_COMPILED),true) | ||||
ifeq ($(ARCH),x86_64) | ifeq ($(ARCH),x86_64) | ||||
Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o | Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o | ||||
endif | endif | ||||
+ ifeq ($(ARCH),amd64) | + ifeq ($(ARCH),amd64) | ||||
+ Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o | + Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o | ||||
+ endif | + endif | ||||
ifeq ($(ARCH),ppc) | ifeq ($(ARCH),ppc) | ||||
Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o | Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o | ||||
endif | endif | ||||
@@ -1591,6 +1609,9 @@ | @@ -1591,6 +1609,9 @@ ifeq ($(HAVE_VM_COMPILED),true) | ||||
ifeq ($(ARCH),x86_64) | ifeq ($(ARCH),x86_64) | ||||
Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o | Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o | ||||
endif | endif | ||||
+ ifeq ($(ARCH),amd64) | + ifeq ($(ARCH),amd64) | ||||
+ Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o | + Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o | ||||
+ endif | + endif | ||||
ifeq ($(ARCH),ppc) | ifeq ($(ARCH),ppc) | ||||
Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o | Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o | ||||
endif | endif |