View | Details | Raw Unified
Collapse All | Expand All

(-) files/quake2-icculus-0.16.1-gentoo-paths.patch (-3 / +17 lines)
 Lines 5-11    Link Here  
diff -u -p -r1.56 Makefile
diff -u -p -r1.56 Makefile
--- Makefile	5 May 2005 22:23:34 -0000	1.56
--- Makefile	5 May 2005 22:23:34 -0000	1.56
+++ Makefile	29 Aug 2005 22:52:28 -0000
+++ Makefile	29 Aug 2005 22:52:28 -0000
@@ -74,35 +74,38 @@ endif
 
@@ -74,35 +74,46 @@ endif
 
 
 
 CC=gcc
 CC=gcc
 Lines 47-52    Link Here  
 endif
 endif
+endif
+endif
+RELEASE_CFLAGS=$(BASE_CFLAGS) $(OPT_CFLAGS)
+RELEASE_CFLAGS=$(BASE_CFLAGS) $(OPT_CFLAGS)
 
 
 VERSION=3.21+r0.16
 VERSION=3.21+r0.16
 Lines 55-69    Link Here  
 endif
 endif
 
 
+ifdef DEFAULT_BASEDIR
+ifdef DEFAULT_BASEDIR
+BASE_CFLAGS += -DDEFAULT_BASEDIR='\"$(DEFAULT_BASEDIR)\"'
 
+endif
+endif
+ifdef DEFAULT_LIBDIR
+ifdef DEFAULT_LIBDIR
+BASE_CFLAGS += -DDEFAULT_LIBDIR='\"$(DEFAULT_LIBDIR)\"'
 
+endif
+endif
+
+
 ifeq ($(strip $(BUILD_QMAX)),YES)
 ifeq ($(strip $(BUILD_QMAX)),YES)
 	BASE_CFLAGS+=-DQMAX
 	BASE_CFLAGS+=-DQMAX
 endif
 endif
@@ -406,7 +424,7 @@
 
 		$(BUILD_DEBUG_DIR)/ctf \
 
 		$(BUILD_DEBUG_DIR)/xatrix \
 
 		$(BUILD_DEBUG_DIR)/rogue
 
-	$(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS) -DLINUX_VERSION='\"$(VERSION) Debug\"'"
 
 
 build_release:
 
 	@-mkdir -p $(BUILD_RELEASE_DIR) \
 
@@ -418,7 +436,7 @@
 
 		$(BUILD_RELEASE_DIR)/ctf \
 
 		$(BUILD_RELEASE_DIR)/xatrix \
 
 		$(BUILD_RELEASE_DIR)/rogue
 
-	$(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(RELEASE_CFLAGS) -DLINUX_VERSION='\"$(VERSION)\"'"
 
 
 targets: $(TARGETS)
 
 
Index: src/linux/qgl_linux.c
Index: src/linux/qgl_linux.c
===================================================================
===================================================================
RCS file: /cvs/cvsroot/quake2/src/linux/qgl_linux.c,v
RCS file: /cvs/cvsroot/quake2/src/linux/qgl_linux.c,v