diff options
author | notaz | 2010-12-31 17:25:34 +0200 |
---|---|---|
committer | notaz | 2010-12-31 17:25:34 +0200 |
commit | 7eadbf885fc9ebd271fa0d7bce3f27394488b059 (patch) | |
tree | 77421edca7c18874132291b2094b1c759344928b /plugins/gpu-gles/gpuExternals.h | |
parent | ce879073e4f228deec8bec5db8a2ff640636c88f (diff) | |
download | pcsx_rearmed-7eadbf885fc9ebd271fa0d7bce3f27394488b059.tar.gz pcsx_rearmed-7eadbf885fc9ebd271fa0d7bce3f27394488b059.tar.bz2 pcsx_rearmed-7eadbf885fc9ebd271fa0d7bce3f27394488b059.zip |
Pickle's port for this emu
Diffstat (limited to 'plugins/gpu-gles/gpuExternals.h')
-rw-r--r-- | plugins/gpu-gles/gpuExternals.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/plugins/gpu-gles/gpuExternals.h b/plugins/gpu-gles/gpuExternals.h index f24c31a..977d74d 100644 --- a/plugins/gpu-gles/gpuExternals.h +++ b/plugins/gpu-gles/gpuExternals.h @@ -32,7 +32,16 @@ #ifdef __cplusplus
extern "C" {
#endif
-#define _GPU_API_
+
+typedef unsigned char u8;
+typedef signed char s8;
+typedef unsigned short int u16;
+typedef signed short int s16;
+typedef unsigned long u32;
+typedef signed long s32;
+typedef unsigned long long int u64;
+typedef signed long long int s64;
+
#ifndef _WINDOWS
#ifdef __NANOGL__
#include <gl/gl.h>
@@ -41,19 +50,13 @@ extern "C" { #ifdef SOFT_LINKAGE
#pragma softfp_linkage
#endif
-#include <gles/gl.h> // for opengl es types
+#include <GLES/gl.h> // for opengl es types
#ifdef SOFT_LINKAGE
#pragma no_softfp_linkage
#endif
#endif
#endif
-#ifdef MAEMO_CHANGES
- #include "../psxCommon.h"
-#else
- #include "psxCommon.h"
-#endif
-
#ifdef __NANOGL__
#define glTexParameteri(x,y,z) glTexParameterf(x,y,z)
#define glAlphaFuncx(x,y) glAlphaFunc(x,y)
@@ -529,7 +532,7 @@ typedef struct { int x;
int y;
} Vec2f;
-/**/
+*/
typedef struct {
Vec3f xyz;
|