SOURCES: quake3-QUAKELIBDIR.patch (NEW), quake3-gpl-Makefile-insta...

Sun Nov 6 20:45:02 CET 2005

Author: sparky                       Date: Sun Nov  6 19:45:02 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- now only fix in makefile is neaded for alpha so moved patch
- build and install shared library
- search for lib in QUAKELIBDIR path

---- Files affected:
SOURCES:
   quake3-QUAKELIBDIR.patch (NONE -> 1.1)  (NEW), quake3-gpl-Makefile-install.patch (1.4 -> 1.5) , quake3-alphafix.patch (1.5 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SOURCES/quake3-QUAKELIBDIR.patch
diff -u /dev/null SOURCES/quake3-QUAKELIBDIR.patch:1.1

--- /dev/null	Sun Nov  6 20:45:02 2005
+++ SOURCES/quake3-QUAKELIBDIR.patch	Sun Nov  6 20:44:57 2005
@@ -0,0 +1,12 @@
+--- quake3/code/unix/unix_main.c~	2005-11-05 01:47:40.000000000 +0100
++++ quake3/code/unix/unix_main.c	2005-11-06 18:17:46.000000000 +0100
+@@ -735,6 +735,9 @@
+   if(!libHandle && homepath)
+     libHandle = try_dlopen(homepath, gamedir, fname, fqpath);
+ 
++  if(!libHandle)
++    libHandle = try_dlopen(QUAKELIBDIR, gamedir, fname, fqpath);
++
+   if(!libHandle && basepath)
+     libHandle = try_dlopen(basepath, gamedir, fname, fqpath);
+ 

================================================================
Index: SOURCES/quake3-gpl-Makefile-install.patch
diff -u SOURCES/quake3-gpl-Makefile-install.patch:1.4 SOURCES/quake3-gpl-Makefile-install.patch:1.5
--- SOURCES/quake3-gpl-Makefile-install.patch:1.4	Tue Nov  1 13:18:45 2005
+++ SOURCES/quake3-gpl-Makefile-install.patch	Sun Nov  6 20:44:57 2005
@@ -1,16 +1,28 @@
 diff -ru quake3/code/unix/Makefile quake3.Mf/code/unix/Makefile
 --- quake3/code/unix/Makefile	2005-11-01 01:42:04.000000000 +0100
 +++ quake3.Mf/code/unix/Makefile	2005-11-01 12:19:21.000000000 +0100
-@@ -178,19 +178,7 @@
-     TARGETS=\
-       $(B)/$(PLATFORM)quake3 \
-       $(B)/$(PLATFORM)q3ded \
--      $(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) \
--      $(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) \
--      $(B)/baseq3/ui$(ARCH).$(SHLIBEXT)     \
--      $(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) \
--      $(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) \
--      $(B)/missionpack/ui$(ARCH).$(SHLIBEXT) \
+@@ -103,9 +103,6 @@
+   CC=gcc
+   CXX=g++
+ 
+-  ifeq ($(ARCH),alpha)
+-    ARCH=axp
+-  else
+   ifeq ($(ARCH),x86_64)
+     LIB=lib64
+   else
+@@ -117,7 +114,6 @@
+   endif
+   endif
+   endif
+-  endif
+ 
+   BASE_CFLAGS = -pipe -Wall -fno-strict-aliasing
+ 
+@@ -191,13 +187,7 @@
+       $(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) \
+       $(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) \
+       $(B)/missionpack/ui$(ARCH).$(SHLIBEXT) \
 -      $(B)/baseq3/vm/cgame.qvm \
 -      $(B)/baseq3/vm/qagame.qvm \
 -      $(B)/baseq3/vm/ui.qvm \
@@ -18,29 +30,52 @@
 -      $(B)/missionpack/vm/cgame.qvm \
 -      $(B)/missionpack/vm/ui.qvm
 -#      $(B)/$(PLATFORM)quake3-smp \
-+#      $(B)/$(PLATFORM)quake3-smp \   # context
++#      $(B)/$(PLATFORM)quake3-smp \ # context
  
    endif
  
-@@ -1535,7 +1523,7 @@
- copyfiles: build_release
- 	@if [ ! -d $(COPYDIR)/baseq3 ]; then echo "You need to set COPYDIR to where you installed Quake III!"; false; fi
- 	$(INSTALL) -s -m 0755 $(BR)/$(PLATFORM)quake3$(BINEXT) $(COPYDIR)/quake3
+@@ -1558,25 +1548,25 @@
+ # MISC
+ #############################################################################
+ 
+-copyfiles: build_release
+-	@if [ ! -d $(COPYDIR)/baseq3 ]; then echo "You need to set COPYDIR to where you installed Quake III!"; false; fi
+-	$(INSTALL) -s -m 0755 $(BR)/$(PLATFORM)quake3$(BINEXT) $(COPYDIR)/quake3
 -	#$(INSTALL) -s -m 0755 $(BR)/$(PLATFORM)quake3-smp$(BINEXT) $(COPYDIR)/quake3-smp
-+	#$(INSTALL) -s -m 0755 $(BR)/$(PLATFORM)quake3-smp$(BINEXT) $(COPYDIR)/quake3-smp # context
- 	$(INSTALL) -s -m 0755 $(BR)/$(PLATFORM)q3ded$(BINEXT) $(COPYDIR)/q3ded
- 	-$(MKDIR) -p -m 0755 $(COPYDIR)/baseq3
- 	$(INSTALL) -s -m 0755 $(BR)/baseq3/cgame$(ARCH).$(SHLIBEXT) \
-@@ -1552,6 +1540,12 @@
- 	$(INSTALL) -s -m 0755 $(BR)/missionpack/ui$(ARCH).$(SHLIBEXT) \
- 					$(COPYDIR)/missionpack/.
- 
-+install:
-+	-mkdir -p -m 0755 $(BINDIR)
-+	install -m 0755 $(BR)/$(PLATFORM)quake3$(BINEXT) $(BINDIR)/quake3
-+	#install -m 0755 $(BR)/$(PLATFORM)quake3-smp$(BINEXT) $(BINDIR)/quake3-smp
-+	install -m 0755 $(BR)/$(PLATFORM)q3ded$(BINEXT) $(BINDIR)/q3ded
-+
+-	$(INSTALL) -s -m 0755 $(BR)/$(PLATFORM)q3ded$(BINEXT) $(COPYDIR)/q3ded
+-	-$(MKDIR) -p -m 0755 $(COPYDIR)/baseq3
+-	$(INSTALL) -s -m 0755 $(BR)/baseq3/cgame$(ARCH).$(SHLIBEXT) \
+-					$(COPYDIR)/baseq3/.
+-	$(INSTALL) -s -m 0755 $(BR)/baseq3/qagame$(ARCH).$(SHLIBEXT) \
+-					$(COPYDIR)/baseq3/.
+-	$(INSTALL) -s -m 0755 $(BR)/baseq3/ui$(ARCH).$(SHLIBEXT) \
+-					$(COPYDIR)/baseq3/.
+-	-$(MKDIR) -p -m 0755 $(COPYDIR)/missionpack
+-	$(INSTALL) -s -m 0755 $(BR)/missionpack/cgame$(ARCH).$(SHLIBEXT) \
+-					$(COPYDIR)/missionpack/.
+-	$(INSTALL) -s -m 0755 $(BR)/missionpack/qagame$(ARCH).$(SHLIBEXT) \
+-					$(COPYDIR)/missionpack/.
+-	$(INSTALL) -s -m 0755 $(BR)/missionpack/ui$(ARCH).$(SHLIBEXT) \
+-					$(COPYDIR)/missionpack/.
++install: build_release
++	-$(MKDIR) -p -m 0755 $(BINDIR)/baseq3
++	$(INSTALL) -m 0755 $(BR)/$(PLATFORM)quake3$(BINEXT) $(BINDIR)/quake3
++	#$(INSTALL) -m 0755 $(BR)/$(PLATFORM)quake3-smp$(BINEXT) $(BINDIR)/quake3-smp
++	$(INSTALL) -m 0755 $(BR)/$(PLATFORM)q3ded$(BINEXT) $(BINDIR)/q3ded
++	-$(MKDIR) -p -m 0755 $(Q3LIBDIR)/baseq3
++	$(INSTALL) -m 0755 $(BR)/baseq3/cgame$(ARCH).$(SHLIBEXT) \
++					$(Q3LIBDIR)/baseq3/.
++	$(INSTALL) -m 0755 $(BR)/baseq3/qagame$(ARCH).$(SHLIBEXT) \
++					$(Q3LIBDIR)/baseq3/.
++	$(INSTALL) -m 0755 $(BR)/baseq3/ui$(ARCH).$(SHLIBEXT) \
++					$(Q3LIBDIR)/baseq3/.
++	-$(MKDIR) -p -m 0755 $(Q3LIBDIR)/missionpack
++	$(INSTALL) -m 0755 $(BR)/missionpack/cgame$(ARCH).$(SHLIBEXT) \
++					$(Q3LIBDIR)/missionpack/.
++	$(INSTALL) -m 0755 $(BR)/missionpack/qagame$(ARCH).$(SHLIBEXT) \
++					$(Q3LIBDIR)/missionpack/.
++	$(INSTALL) -m 0755 $(BR)/missionpack/ui$(ARCH).$(SHLIBEXT) \
++					$(Q3LIBDIR)/missionpack/.
+ 
  clean:clean-debug clean-release
  
- clean2:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/quake3-gpl-Makefile-install.patch?r1=1.4&r2=1.5&f=u


