nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-26 22:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixes courtesy of DyB|Tuna, to fix mac/sdl2 compilation.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4726 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2014-08-18 10:05:10 +00:00
parent c61f77af28
commit 23b7a15980
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
engine/client/in_sdl.c
View file

@ -104,6 +104,7 @@ static void J_JoystickAdded(int enumid)
} }
static struct sdljoy_s *J_DevId(int jid) static struct sdljoy_s *J_DevId(int jid)
{ {
int i;
for (i = 0; i < MAX_JOYSTICKS; i++) for (i = 0; i < MAX_JOYSTICKS; i++)
if (sdljoy[i].joystick && sdljoy[i].id == jid) if (sdljoy[i].joystick && sdljoy[i].id == jid)
return &sdljoy[i]; return &sdljoy[i];

3
engine/gl/glquake.h
View file

@ -76,6 +76,9 @@ extern r_config_t r_config;
#elif defined(__MACOSX__) #elif defined(__MACOSX__)
//apple, you suck. //apple, you suck.
#include <AGL/agl.h> #include <AGL/agl.h>
#elif defined(__APPLE__)
#include <OpenGL/gl.h> //tuna says use this.
//apple really do suck.
#elif defined(NACL) || defined(FTE_TARGET_WEB) #elif defined(NACL) || defined(FTE_TARGET_WEB)
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#define GLclampd GLclampf #define GLclampd GLclampf