Merge branch 'some-small-compiling-fix' into 'master'

Some small compiling fix

~~See commit description for details, I'm not repeating it all here with different words.~~

~~Needs testing before we actually merge the changes in, I don't have anything besides Windows so I can't actually try this fix out for myself sadly. :(~~

This was originally a quick branch I made to fix a problem so that @wolfy852  could compile with Linux on some thing of his ...turned out not to be the only problem, and then I found a slightly unrelated problem altogether. So it's now a small assortment of compiling-related fixes.

Also should be merged to next, which is hopefully obvious.

See merge request !29
This commit is contained in:
Monster Iestyn 2016-01-11 21:20:01 -05:00
commit 554c62891d
3 changed files with 6 additions and 4 deletions

View file

@ -21,9 +21,9 @@
/// \brief SRB2 system stuff for SDL /// \brief SRB2 system stuff for SDL
#ifdef CMAKECONFIG #ifdef CMAKECONFIG
#include "config.h" #include "../config.h"
#else #else
#include "config.h.in" #include "../config.h.in"
#endif #endif
#ifndef _WIN32_WCE #ifndef _WIN32_WCE

View file

@ -217,10 +217,12 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
} }
} }
#ifdef HWRENDER
if (rendermode == render_opengl) if (rendermode == render_opengl)
{ {
OglSdlSurface(vid.width, vid.height); OglSdlSurface(vid.width, vid.height);
} }
#endif
if (rendermode == render_soft) if (rendermode == render_soft)
{ {
@ -401,9 +403,11 @@ static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code)
default: default:
break; break;
} }
#ifdef HWRENDER
DBG_Printf("Unknown incoming scancode: %d, represented %c\n", DBG_Printf("Unknown incoming scancode: %d, represented %c\n",
code, code,
SDL_GetKeyName(SDL_GetKeyFromScancode(code))); SDL_GetKeyName(SDL_GetKeyFromScancode(code)));
#endif
return 0; return 0;
} }

View file

@ -16,8 +16,6 @@
#ifdef HWRENDER #ifdef HWRENDER
#include "hardware/hw_data.h" #include "hardware/hw_data.h"
#else
typedef void GLPatch_t;
#endif #endif
#ifdef __GNUG__ #ifdef __GNUG__