3 files changed, 14 insertions, 65 deletions

diff --git a/games/darkplaces/files/patch-fs.c b/games/darkplaces/files/patch-fs.c
index 373ba2a3d07e..305b11b0a7ea 100644
--- a/games/darkplaces/files/patch-fs.c
+++ b/games/darkplaces/files/patch-fs.c
@@ -1,10 +1,10 @@
---- fs.c.orig	Tue Aug  2 23:18:34 2005
-+++ fs.c	Sun Jan 15 17:38:11 2006
-@@ -933,7 +933,7 @@
+--- fs.c.orig	Sun May 28 18:26:08 2006
++++ fs.c	Sun Jul 23 16:31:17 2006
+@@ -1061,7 +1061,7 @@
  
  	fs_mempool = Mem_AllocPool("file management", 0, NULL);
  
--	strcpy(fs_basedir, ".");
+-	strcpy(fs_basedir, "");
 +	strcpy(fs_basedir, Q1DIR);
  	strcpy(fs_gamedir, "");
  
diff --git a/games/darkplaces/files/patch-gl_backend.c b/games/darkplaces/files/patch-gl_backend.c
deleted file mode 100644
index f588175a3c9c..000000000000
--- a/games/darkplaces/files/patch-gl_backend.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- gl_backend.c.orig	Fri May 20 00:24:12 2005
-+++ gl_backend.c	Sun Jan 15 17:06:32 2006
-@@ -21,6 +21,8 @@
- cvar_t gl_dither = {CVAR_SAVE, "gl_dither", "1"}; // whether or not to use dithering
- cvar_t gl_lockarrays = {0, "gl_lockarrays", "1"};
- 
-+cvar_t gl_compilelogs = {0, "gl_compilelogs", "0"};
-+
- int gl_maxdrawrangeelementsvertices;
- int gl_maxdrawrangeelementsindices;
- 
-@@ -236,6 +238,7 @@
- 	Cvar_RegisterVariable(&gl_polyblend);
- 	Cvar_RegisterVariable(&gl_dither);
- 	Cvar_RegisterVariable(&gl_lockarrays);
-+	Cvar_RegisterVariable(&gl_compilelogs);
- 	Cvar_RegisterVariable(&gl_paranoid);
- 	Cvar_RegisterVariable(&gl_printcheckerror);
- #ifdef NORENDER
-@@ -780,7 +783,7 @@
- 		CHECKGLERROR
- 		qglGetObjectParameterivARB(vertexshaderobject, GL_OBJECT_COMPILE_STATUS_ARB, &vertexshadercompiled);
- 		qglGetInfoLogARB(vertexshaderobject, sizeof(compilelog), NULL, compilelog);
--		if (compilelog[0])
-+		if (gl_compilelogs.integer && compilelog[0])
- 			Con_Printf("vertex shader compile log:\n%s\n", compilelog);
- 		if (!vertexshadercompiled)
- 		{
-@@ -809,7 +812,7 @@
- 		CHECKGLERROR
- 		qglGetObjectParameterivARB(fragmentshaderobject, GL_OBJECT_COMPILE_STATUS_ARB, &fragmentshadercompiled);
- 		qglGetInfoLogARB(fragmentshaderobject, sizeof(compilelog), NULL, compilelog);
--		if (compilelog[0])
-+		if (gl_compilelogs.integer && compilelog[0])
- 			Con_Printf("fragment shader compile log:\n%s\n", compilelog);
- 		if (!fragmentshadercompiled)
- 		{
-@@ -827,7 +830,7 @@
- 	CHECKGLERROR
- 	qglGetObjectParameterivARB(programobject, GL_OBJECT_LINK_STATUS_ARB, &programlinked);
- 	qglGetInfoLogARB(programobject, sizeof(compilelog), NULL, compilelog);
--	if (compilelog[0])
-+	if (gl_compilelogs.integer && compilelog[0])
- 	{
- 		Con_Printf("program link log:\n%s\n", compilelog);
- 		// software vertex shader is ok but software fragment shader is WAY
diff --git a/games/darkplaces/files/patch-makefile.inc b/games/darkplaces/files/patch-makefile.inc
index fef9538df26c..f3cd02412bb5 100644
--- a/games/darkplaces/files/patch-makefile.inc
+++ b/games/darkplaces/files/patch-makefile.inc
@@ -1,12 +1,12 @@
---- makefile.inc.orig	Thu Aug 18 21:30:57 2005
-+++ makefile.inc	Sun Jan 15 17:16:57 2006
+--- makefile.inc.orig	Sun Apr 16 23:23:11 2006
++++ makefile.inc	Sun Jul 23 16:34:36 2006
 @@ -1,5 +1,4 @@
  # Choose the compiler you want to use
 -CC=gcc
  
  # athlon optimizations
  #CPUOPTIMIZATIONS=-march=athlon
-@@ -135,13 +134,19 @@
+@@ -137,13 +136,19 @@
  
  # Compilation
  # CFLAGS_COMMON=-MD -Wall -Werror
@@ -28,33 +28,28 @@
  
  DO_CC=$(CC) $(CFLAGS) -c $< -o $@
  
-@@ -157,14 +162,14 @@
+@@ -159,9 +164,9 @@
  OBJ_GLX= builddate.c sys_linux.o vid_glx.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
  
  LDFLAGS_UNIXCOMMON=-lm
--#LDFLAGS_UNIXCL=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
-+#LDFLAGS_UNIXCL=-L$(X11BASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
- ifeq ($(DP_MAKE_TARGET), sunos)
- 	LDFLAGS_UNIXCL=-R$(UNIX_X11LIBPATH) -L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86vm $(LIB_SOUND)
- else
- 	LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
- endif
+-LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
++LDFLAGS_UNIXCL=-L$(X11BASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
  
 -LDFLAGS_UNIXSDL=`sdl-config --libs`
 +LDFLAGS_UNIXSDL=`$(SDL_CONFIG) --libs`
  EXE_UNIXCL=darkplaces-glx
  EXE_UNIXSV=darkplaces-dedicated
  EXE_UNIXSDL=darkplaces-sdl
-@@ -195,7 +200,7 @@
+@@ -193,7 +198,7 @@
  # Link
- LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXCL)
+ LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl -framework Carbon $(LIB_SOUND)
  LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl
 -LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl `sdl-config --static-libs`
 +LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl `$(SDL_CONFIG) --static-libs`
  
  OBJ_AGL= builddate.c sys_linux.o vid_agl.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
  
-@@ -238,7 +243,7 @@
+@@ -240,7 +245,7 @@
  LDFLAGS_WINCOMMON=-lwinmm -lwsock32
  LDFLAGS_WINCL=$(LDFLAGS_WINCOMMON) -mwindows -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32
  LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) -mconsole
@@ -63,7 +58,7 @@
  EXE_WINCL=darkplaces.exe
  EXE_WINSV=darkplaces-dedicated.exe
  EXE_WINSDL=darkplaces-sdl.exe
-@@ -330,40 +335,40 @@
+@@ -357,40 +362,40 @@
  	@echo "========== $(EXE) (debug) =========="
  	$(MAKE) $(EXE) \
  		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \