Merge branch 'master' of github.com:yquake2/yquake2

src/client/sound/snd_al.c

@@ -48,7 +48,10 @@ qboolean streamPlaying;
 int active_buffers;
 
 static ALuint streamSource;
+
+#ifndef __APPLE__
 static ALuint underwaterFilter;
+#endif
 
 static ALuint s_srcnums[MAX_CHANNELS - 1];
 static int s_framecount;

src/refresh/files/jpeg.c

@@ -27,8 +27,14 @@
 #ifdef RETEXTURE
 
 #include "../header/local.h"
+
+#ifdef __APPLE__
+#include <libjpeg/jpeglib.h>
+#include <libjpeg/jerror.h>
+#else
 #include <jpeglib.h>
 #include <jerror.h>
+#endif
 
 void jpeg_memory_src(j_decompress_ptr cinfo,
 		unsigned char *inbuffer,