archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 00:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #217 from Bigpet/master

Browse source 
fix msvc opengl includes
This commit is contained in:
Alexandro Sánchez Bach 2014-05-01 21:07:40 +02:00
commit 5b0ebacc40
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/GS/GL/OpenGL.h
View file

@ -4,6 +4,8 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#include "GL/gl.h"
#include "GL/glext.h"
typedef BOOL (WINAPI* PFNWGLSWAPINTERVALEXTPROC) (int interval); typedef BOOL (WINAPI* PFNWGLSWAPINTERVALEXTPROC) (int interval);
#define OPENGL_PROC(p, n) extern p gl##n #define OPENGL_PROC(p, n) extern p gl##n
@ -12,7 +14,7 @@ typedef BOOL (WINAPI* PFNWGLSWAPINTERVALEXTPROC) (int interval);
#undef OPENGL_PROC #undef OPENGL_PROC
#undef OPENGL_PROC2 #undef OPENGL_PROC2
#elif __APPLE__ #elif defined(__APPLE__)
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <OpenGL/glu.h> #include <OpenGL/glu.h>

4
rpcs3/rpcs3.cpp
View file

@ -72,11 +72,9 @@ void Rpcs3App::SendDbgCommand(DbgCommand id, CPUThread* thr)
Rpcs3App::Rpcs3App() Rpcs3App::Rpcs3App()
{ {
#ifdef __UNIX__ #if defined(__UNIX__) && !defined(__APPLE__)
#ifndef __APPLE__
XInitThreads(); XInitThreads();
#endif #endif
#endif
} }
/* /*
CPUThread& GetCPU(const u8 core) CPUThread& GetCPU(const u8 core)