From 0112ea1c6bdb662dc032ebd93ff8f038c70a8704 Mon Sep 17 00:00:00 2001
From: "SND\\shalma_cp" <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Mon, 20 Dec 2010 03:10:18 +0000
Subject: macosx - dfsound (null) - (MaddTheSane) configure screen - Patch
 #7815

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@61342 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 plugins/peopsxgl/gpu.c    |  2 +-
 plugins/peopsxgl/stdafx.h | 64 +++++++++++++++++++++++++++++------------------
 2 files changed, 40 insertions(+), 26 deletions(-)

(limited to 'plugins')

diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c
index 91a10b2c..beb11156 100644
--- a/plugins/peopsxgl/gpu.c
+++ b/plugins/peopsxgl/gpu.c
@@ -21,7 +21,7 @@
 
 #include "stdafx.h"
 
-#ifndef _WINDOWS
+#if !defined(_MACGL) && !defined(_WINDOWS)
 
 #include "config.h"
 
diff --git a/plugins/peopsxgl/stdafx.h b/plugins/peopsxgl/stdafx.h
index ffa66fd1..b1e3f06e 100644
--- a/plugins/peopsxgl/stdafx.h
+++ b/plugins/peopsxgl/stdafx.h
@@ -36,35 +36,49 @@
 
 #include <GL/gl.h>
 
+#elif defined(_MACGL)
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <OpenGL/gl.h>
+#include <math.h> 
+
+#define CALLBACK /* */
+
 #else
 
-#define __X11_C_
-#define __inline inline
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <GL/gl.h>
-#include <GL/glx.h>
-#include <math.h> 
-#include <X11/cursorfont.h> 
-
-#define CALLBACK /* */
+#define __X11_C_
+#define __inline inline
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <GL/gl.h>
+#include <GL/glx.h>
+#include <math.h> 
+#include <X11/cursorfont.h> 
+
+#define CALLBACK /* */
 
 #endif
-
-#include "gl_ext.h"
-
-#define SHADETEXBIT(x) ((x>>24) & 0x1)
-#define SEMITRANSBIT(x) ((x>>25) & 0x1)
+
+#include "gl_ext.h"
+
+#define SHADETEXBIT(x) ((x>>24) & 0x1)
+#define SEMITRANSBIT(x) ((x>>25) & 0x1)
 
 #ifndef _WINDOWS
-#ifndef GL_BGRA_EXT
-#define GL_BGRA_EXT GL_BGRA
-#endif
-#define GL_COLOR_INDEX8_EXT 0x80E5
+#ifndef GL_BGRA_EXT
+#define GL_BGRA_EXT GL_BGRA
+#endif
+#define GL_COLOR_INDEX8_EXT 0x80E5
 #endif
-- 
cgit v1.2.3