Merge pull request #1053 from cxd4/wow-such-glide
[Glide64] got it compiling on Linux
This commit is contained in:
commit
f97a4c9d5f
|
@ -861,11 +861,7 @@ int InitGfx()
|
||||||
}
|
}
|
||||||
//*/
|
//*/
|
||||||
|
|
||||||
/*
|
#ifndef ANDROID
|
||||||
* 2016.03.27 cxd4 -- to do: #ifdef _WIN32 or #ifndef _ANDROID?
|
|
||||||
* Can't tell which one is correct here, but I think the latter.
|
|
||||||
*/
|
|
||||||
#ifdef _WIN32
|
|
||||||
uint32_t res_data = g_settings->res_data;
|
uint32_t res_data = g_settings->res_data;
|
||||||
if (ev_fullscreen)
|
if (ev_fullscreen)
|
||||||
{
|
{
|
||||||
|
@ -886,7 +882,11 @@ int InitGfx()
|
||||||
gfx_context = grSstWinOpen(gfx.hWnd, res_data, GR_REFRESH_60Hz, GR_COLORFORMAT_RGBA, GR_ORIGIN_UPPER_LEFT, 2, 1);
|
gfx_context = grSstWinOpen(gfx.hWnd, res_data, GR_REFRESH_60Hz, GR_COLORFORMAT_RGBA, GR_ORIGIN_UPPER_LEFT, 2, 1);
|
||||||
if (!gfx_context)
|
if (!gfx_context)
|
||||||
{
|
{
|
||||||
|
#ifdef _WIN32
|
||||||
MessageBox(gfx.hWnd, "Error setting display mode", "Error", MB_OK | MB_ICONEXCLAMATION);
|
MessageBox(gfx.hWnd, "Error setting display mode", "Error", MB_OK | MB_ICONEXCLAMATION);
|
||||||
|
#else
|
||||||
|
fprintf(stderr, "Error setting display mode\n");
|
||||||
|
#endif
|
||||||
grGlideShutdown();
|
grGlideShutdown();
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -1437,10 +1437,10 @@ int CALL InitiateGFX(GFX_INFO Gfx_Info)
|
||||||
ZLUT_init();
|
ZLUT_init();
|
||||||
|
|
||||||
grConfigWrapperExt(
|
grConfigWrapperExt(
|
||||||
#ifdef _WIN32
|
#ifdef ANDROID
|
||||||
g_settings->wrpResolution, g_settings->wrpVRAM * 1024 * 1024, g_settings->wrpFBO, g_settings->wrpAnisotropic
|
|
||||||
#else
|
|
||||||
g_settings->wrpVRAM * 1024 * 1024, g_settings->wrpFBO, g_settings->wrpAnisotropic
|
g_settings->wrpVRAM * 1024 * 1024, g_settings->wrpFBO, g_settings->wrpAnisotropic
|
||||||
|
#else
|
||||||
|
g_settings->wrpResolution, g_settings->wrpVRAM * 1024 * 1024, g_settings->wrpFBO, g_settings->wrpAnisotropic
|
||||||
#endif
|
#endif
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue