zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 00:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Useless yet innocuous sdlayer fixes

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7045 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-10-07 05:23:44 +00:00
parent 78a3797295
commit 3689f9c70c
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/build/src/sdlayer.cpp
View file

@ -773,7 +773,7 @@ static SDL_Joystick *joydev = NULL;
// //
int32_t initinput(void) int32_t initinput(void)
{ {
int32_t i, j; int32_t i;
#ifdef _WIN32 #ifdef _WIN32
Win_GetOriginalLayoutName(); Win_GetOriginalLayoutName();
@ -781,10 +781,12 @@ int32_t initinput(void)
#endif #endif
#if defined EDUKE32_OSX #if defined EDUKE32_OSX
static char sdl_has3buttonmouse[] = "SDL_HAS3BUTTONMOUSE=1";
// force OS X to operate in >1 button mouse mode so that LMB isn't adulterated // force OS X to operate in >1 button mouse mode so that LMB isn't adulterated
if (!getenv("SDL_HAS3BUTTONMOUSE")) if (!getenv("SDL_HAS3BUTTONMOUSE"))
{
static char sdl_has3buttonmouse[] = "SDL_HAS3BUTTONMOUSE=1";
putenv(sdl_has3buttonmouse); putenv(sdl_has3buttonmouse);
}
#endif #endif
inputdevices = 1 | 2; // keyboard (1) and mouse (2) inputdevices = 1 | 2; // keyboard (1) and mouse (2)
@ -814,7 +816,7 @@ int32_t initinput(void)
i = SDL_NumJoysticks(); i = SDL_NumJoysticks();
initprintf("%d joystick(s) found\n", i); initprintf("%d joystick(s) found\n", i);
for (j = 0; j < i; j++) for (int32_t j = 0; j < i; j++)
initprintf(" %d. %s\n", j + 1, SDL_JoystickNameForIndex(j)); initprintf(" %d. %s\n", j + 1, SDL_JoystickNameForIndex(j));
joydev = SDL_JoystickOpen(0); joydev = SDL_JoystickOpen(0);
@ -1537,7 +1539,7 @@ int32_t videoSetMode(int32_t x, int32_t y, int32_t c, int32_t fs)
#ifdef USE_OPENGL #ifdef USE_OPENGL
if (c > 8 || !nogl) if (c > 8 || !nogl)
{ {
int32_t i, j; int32_t i;
#ifdef USE_GLEXT #ifdef USE_GLEXT
int32_t multisamplecheck = (glmultisample > 0); int32_t multisamplecheck = (glmultisample > 0);
#else #else