From 9058b26f5645cd18f8f3b000fb197a8df66ba031 Mon Sep 17 00:00:00 2001
From: Jeff Teunissen <deek@d2dc.net>
Date: Sat, 22 Dec 2001 08:45:50 +0000
Subject: [PATCH] Misc. cleanups.

---
 linux/Makefile |  6 +++---
 linux/gl_glx.c | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/linux/Makefile b/linux/Makefile
index 073cf9d..cac2ecd 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -40,9 +40,9 @@ SVGALDFLAGS=-lvga
 XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext
 XCFLAGS=
 
-GLLDFLAGS=-L/usr/local/glide/lib -L/usr/X11R6/lib -L/usr/local/lib \
-	-lGL -lX11 -lXext -lvga
-GLCFLAGS=-I/usr/local/src/Mesa-2.6/include -I/usr/local/glide/include
+GLLDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib \
+	-lGL -lX11 -lXext -lpthread
+GLCFLAGS=
 
 SHLIBEXT=so
 
diff --git a/linux/gl_glx.c b/linux/gl_glx.c
index a1cc4aa..6b78526 100644
--- a/linux/gl_glx.c
+++ b/linux/gl_glx.c
@@ -44,6 +44,7 @@ static int				StudlyRGBattributes[] =
     GLX_GREEN_SIZE, 4,
     GLX_BLUE_SIZE, 4,
     GLX_DEPTH_SIZE, 1,
+//    GLX_SAMPLES_SGIS, 4, /* for better AA */
     None,
 };
 
@@ -420,23 +421,25 @@ qboolean GLimp_InitGraphics( qboolean fullscreen )
 
 // set window properties for full screen
 	if (fullscreen) {
-	    //MotifWmHints    wmhints;
-	    //Atom aHints;
+//	    MotifWmHints    wmhints;
+	    Atom aHints;
 	    XSizeHints              sizehints;
 	    XWindowChanges  changes;
-/*
+
 	    aHints = XInternAtom( x_disp, "_MOTIF_WM_HINTS", 0 );
 	    if (aHints == None)
 	    {
                 ri.Con_Printf( PRINT_ALL, "Could not intern X atom for _MOTIF_WM_HINTS." );
-//                 return( false );
+/*                 return( false ); */
 	    }
 	    else {
+#if 0
 		wmhints.flags = MWM_HINTS_DECORATIONS;
 		wmhints.decorations = 0; // Absolutely no decorations.
 		XChangeProperty(x_disp, x_win, aHints, aHints, 32,
 				PropModeReplace, (unsigned char *)&wmhints,
 				4 );
+#endif
 
 		sizehints.flags = USPosition | USSize;
 		sizehints.x = 0;
@@ -454,7 +457,6 @@ qboolean GLimp_InitGraphics( qboolean fullscreen )
 				 CWX | CWY | CWWidth | CWHeight | CWStackMode,
 				 &changes);
 	    }
-*/
 	}
 
 // map the window