osx compile fixes + wx latest non working try
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1501 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
607f5b289f
commit
835f38c6e0
|
@ -39,11 +39,14 @@ typedef signed __int32 s32;
|
|||
typedef signed __int64 s64;
|
||||
|
||||
#else
|
||||
#ifdef BOOL
|
||||
#undef BOOL
|
||||
#endif
|
||||
|
||||
typedef unsigned char u8;
|
||||
typedef unsigned short u16;
|
||||
typedef unsigned int u32;
|
||||
typedef signed int BOOL;
|
||||
typedef signed char BOOL;
|
||||
typedef unsigned long long u64;
|
||||
|
||||
typedef char s8;
|
||||
|
|
|
@ -32,11 +32,6 @@
|
|||
// long term, kill these
|
||||
|
||||
// glxew defines BOOL. evil.
|
||||
#ifdef BOOL
|
||||
#undef BOOL
|
||||
#endif
|
||||
|
||||
#define BOOL unsigned int
|
||||
#define HWND void*
|
||||
#define HINSTANCE void*
|
||||
#endif
|
||||
|
|
|
@ -217,12 +217,13 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
|
|||
wxPoint(50,50), size);
|
||||
GLWin.glCanvas = new wxGLCanvas(GLWin.frame, wxID_ANY, attrib,
|
||||
wxPoint(0,0), size, wxSUNKEN_BORDER);
|
||||
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
|
||||
|
||||
GLWin.frame->Show(TRUE);
|
||||
GLWin.glCanvas->Show(TRUE);
|
||||
|
||||
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
|
||||
// GLWin.glCanvas->SetCurrent(*GLWin.glCtxt);
|
||||
GLWin.glCtxt->SetCurrent(*GLWin.glCanvas);
|
||||
GLWin.glCanvas->SetCurrent(*GLWin.glCtxt);
|
||||
// GLWin.glCtxt->SetCurrent(*GLWin.glCanvas);
|
||||
#elif defined(_WIN32)
|
||||
// create the window
|
||||
if (!g_Config.renderToMainframe || g_VideoInitialize.pWindowHandle == NULL)
|
||||
|
|
|
@ -96,7 +96,8 @@ conf.Define('HAVE_XXF86VM', gfxenv['HAVE_XXF86VM'])
|
|||
conf.Finish()
|
||||
|
||||
# change to True if you want to compile with SDL
|
||||
useSDL = not (gfxenv['HAVE_X11'] and gfxenv['HAVE_XXF86VM'])
|
||||
useSDL = not ((gfxenv['HAVE_X11'] and gfxenv['HAVE_XXF86VM'])
|
||||
or gfxenv['HAVE_COCOA'])
|
||||
|
||||
|
||||
if useSDL and not gfxenv['HAVE_SDL']:
|
||||
|
|
Loading…
Reference in New Issue