diff options
| author | alepulver <alepulver@FreeBSD.org> | 2007-09-29 09:41:59 +0800 |
|---|---|---|
| committer | alepulver <alepulver@FreeBSD.org> | 2007-09-29 09:41:59 +0800 |
| commit | bac285b49e1cdb697805b4d2c772fc57dd8496ce (patch) | |
| tree | 013328e4789fdeb44afa3f03aa67283589cd1441 /games/ioquake3 | |
| parent | 78a5df65169d1e17d4aef0d9564f977b52eb3cbc (diff) | |
| download | freebsd-ports-gnome-bac285b49e1cdb697805b4d2c772fc57dd8496ce.tar.gz freebsd-ports-gnome-bac285b49e1cdb697805b4d2c772fc57dd8496ce.tar.zst freebsd-ports-gnome-bac285b49e1cdb697805b4d2c772fc57dd8496ce.zip | |
- Fix building when MP3 option is disabled.
Diffstat (limited to 'games/ioquake3')
| -rw-r--r-- | games/ioquake3/files/patch-Makefile | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/games/ioquake3/files/patch-Makefile b/games/ioquake3/files/patch-Makefile index 70d1aa3fe694..f1123b4b68b4 100644 --- a/games/ioquake3/files/patch-Makefile +++ b/games/ioquake3/files/patch-Makefile @@ -1,5 +1,5 @@ --- Makefile.orig Tue Nov 28 19:05:39 2006 -+++ Makefile Fri Sep 14 14:44:03 2007 ++++ Makefile Fri Sep 28 22:39:49 2007 @@ -26,11 +26,20 @@ endif endif @@ -258,15 +258,23 @@ targets: $(TARGETS) -@@ -836,6 +846,7 @@ +@@ -835,8 +845,13 @@ + $(B)/client/snd_main.o \ $(B)/client/snd_codec.o \ $(B)/client/snd_codec_wav.o \ - $(B)/client/snd_codec_ogg.o \ -+ $(B)/client/snd_codec_mp3.o \ - \ +- $(B)/client/snd_codec_ogg.o \ +- \ ++ $(B)/client/snd_codec_ogg.o ++ ++ifeq ($(USE_CODEC_MP3),1) ++ Q3OBJ += $(B)/client/snd_codec_mp3.o ++endif ++ ++Q3OBJ += \ $(B)/client/qal.o \ $(B)/client/snd_openal.o \ -@@ -964,13 +975,10 @@ + \ +@@ -964,13 +979,10 @@ ifeq ($(ARCH),i386) Q3OBJ += $(B)/client/vm_x86.o endif @@ -282,7 +290,7 @@ Q3OBJ += $(B)/client/$(VM_PPC).o endif endif -@@ -1017,10 +1025,10 @@ +@@ -1017,10 +1029,10 @@ $(B)/client/sdl_glimp_smp.o endif @@ -295,7 +303,7 @@ $(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) -@@ -1056,6 +1064,7 @@ +@@ -1056,6 +1068,7 @@ $(B)/client/snd_codec.o : $(CDIR)/snd_codec.c; $(DO_CC) $(B)/client/snd_codec_wav.o : $(CDIR)/snd_codec_wav.c; $(DO_CC) $(B)/client/snd_codec_ogg.o : $(CDIR)/snd_codec_ogg.c; $(DO_CC) @@ -303,7 +311,7 @@ $(B)/client/qal.o : $(CDIR)/qal.c; $(DO_CC) $(B)/client/snd_openal.o : $(CDIR)/snd_openal.c; $(DO_CC) -@@ -1317,18 +1326,15 @@ +@@ -1317,18 +1330,15 @@ ifeq ($(ARCH),i386) Q3DOBJ += $(B)/ded/vm_x86.o endif @@ -325,7 +333,7 @@ $(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) $(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC) -@@ -1445,7 +1451,7 @@ +@@ -1445,7 +1455,7 @@ Q3CGOBJ = $(Q3CGOBJ_) $(B)/baseq3/cgame/cg_syscalls.o Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm @@ -334,7 +342,7 @@ $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ) $(B)/baseq3/vm/cgame.qvm: $(Q3CGVMOBJ) $(CGDIR)/cg_syscalls.asm -@@ -1486,7 +1492,7 @@ +@@ -1486,7 +1496,7 @@ MPCGOBJ = $(MPCGOBJ_) $(B)/missionpack/cgame/cg_syscalls.o MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm @@ -343,7 +351,7 @@ $(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ) $(B)/missionpack/vm/cgame.qvm: $(MPCGVMOBJ) $(CGDIR)/cg_syscalls.asm -@@ -1536,7 +1542,7 @@ +@@ -1536,7 +1546,7 @@ Q3GOBJ = $(Q3GOBJ_) $(B)/baseq3/game/g_syscalls.o Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm @@ -352,7 +360,7 @@ $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ) $(B)/baseq3/vm/qagame.qvm: $(Q3GVMOBJ) $(GDIR)/g_syscalls.asm -@@ -1584,7 +1590,7 @@ +@@ -1584,7 +1594,7 @@ MPGOBJ = $(MPGOBJ_) $(B)/missionpack/game/g_syscalls.o MPGVMOBJ = $(MPGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm @@ -361,7 +369,7 @@ $(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ) $(B)/missionpack/vm/qagame.qvm: $(MPGVMOBJ) $(GDIR)/g_syscalls.asm -@@ -1644,7 +1650,7 @@ +@@ -1644,7 +1654,7 @@ Q3UIOBJ = $(Q3UIOBJ_) $(B)/missionpack/ui/ui_syscalls.o Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm @@ -370,7 +378,7 @@ $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) $(B)/baseq3/vm/ui.qvm: $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm -@@ -1669,7 +1675,7 @@ +@@ -1669,7 +1679,7 @@ MPUIOBJ = $(MPUIOBJ_) $(B)/missionpack/ui/ui_syscalls.o MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm |