X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=vid_glx.c;h=6aeb59220f00dc40967e4142c61536c95383e05a;hb=1d1f619196e21c77e48612ddd2ec9bee0387ad9a;hp=b175bbcb612c9438947291e670a39cc8c3939a4f;hpb=421bafc6ee5fc2c8713979dc744e21fa3f366eee;p=xonotic%2Fdarkplaces.git

diff --git a/vid_glx.c b/vid_glx.c
index b175bbcb..6aeb5922 100644
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -35,13 +35,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <X11/cursorfont.h>
 
 #include <X11/extensions/XShm.h>
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__MACH__)
 #include <X11/extensions/xf86dga.h>
 #endif
 #include <X11/extensions/xf86vmode.h>
 
 #include "quakedef.h"
 
+// Tell startup code that we have a client
 int cl_available = true;
 
 //GLX prototypes
@@ -683,7 +684,11 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 	int MajorVersion, MinorVersion;
 	const char *drivername;
 
+#if defined(__APPLE__) && defined(__MACH__)
+	drivername = "/usr/X11R6/lib/libGL.1.dylib";
+#else
 	drivername = "libGL.so.1";
+#endif
 	i = COM_CheckParm("-gl_driver");
 	if (i && i < com_argc - 1)
 		drivername = com_argv[i + 1];