summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Pulver <alepulver@FreeBSD.org>2006-05-27 15:55:52 +0000
committerAlejandro Pulver <alepulver@FreeBSD.org>2006-05-27 15:55:52 +0000
commit1155007e7c579c81fc1925e39edeac3df0009755 (patch)
tree0f07fc21c5c2af1d12c705b6917a9f2e0d8538f8
parentAdd cygne-sdl 0.1, the SDL port of Cygne, a free Bandai Wonderswan (diff)
- Fix building the X11 client on non i386 architectures.
Approved by: garga (mentor, implicitly)
-rw-r--r--games/joequake/files/patch-Makefile.linux18
1 files changed, 4 insertions, 14 deletions
diff --git a/games/joequake/files/patch-Makefile.linux b/games/joequake/files/patch-Makefile.linux
index b3964d50a009..b869b5c89c7c 100644
--- a/games/joequake/files/patch-Makefile.linux
+++ b/games/joequake/files/patch-Makefile.linux
@@ -1,5 +1,5 @@
---- ./Makefile.linux.orig Sat Apr 22 12:10:56 2006
-+++ ./Makefile.linux Sat May 20 10:03:52 2006
+--- Makefile.linux.orig Sat Apr 22 12:10:56 2006
++++ Makefile.linux Sat May 27 12:41:15 2006
@@ -4,14 +4,25 @@
# by Slawomir Mazurek <homer13@o2.pl>
#
@@ -79,7 +79,7 @@
glx: _DIR := $(GLX_DIR)
glx: _OBJS := $(GLX_C_OBJS) $(GLX_S_OBJS)
-@@ -138,27 +156,37 @@
+@@ -138,21 +156,27 @@
snd_linux image version security \
iplog cl_slist
@@ -108,19 +108,9 @@
+ -L$(X11BASE)/lib -lX11 -lXext \
+ -L$(LOCALBASE)/lib -lpng
-+ifeq ($(ARCH),i386)
x11: _DIR := $(X11_DIR)
x11: _OBJS := $(X11_C_OBJS) $(X11_S_OBJS)
- x11: _LDFLAGS := $(X11_LDFLAGS)
- x11: _CFLAGS := $(X11_CFLAGS)
- x11: $(X11_TARGET)
-+else
-+x11:
-+endif
-
- $(X11_TARGET): $(X11_DIR) $(X11_C_OBJS) $(X11_S_OBJS)
- $(BUILD)
-@@ -213,17 +241,25 @@
+@@ -213,17 +237,25 @@
SVGA_C_OBJS := $(addprefix $(SVGA_DIR)/, $(addsuffix .o, $(SVGA_C_FILES)))
SVGA_S_OBJS := $(addprefix $(SVGA_DIR)/, $(addsuffix .o, $(SVGA_S_FILES)))