pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed building for Android

Browse source
This commit is contained in:
Sam Lantinga 2011-02-03 01:30:28 -08:00
parent 5689d8ef80
commit 6ddcc36edf
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Android.mk
View file

@ -30,6 +30,9 @@ LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \ $(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \ $(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
$(wildcard $(LOCAL_PATH)/src/power/*.c) \ $(wildcard $(LOCAL_PATH)/src/power/*.c) \
$(wildcard $(LOCAL_PATH)/src/render/*.c) \
$(wildcard $(LOCAL_PATH)/src/render/opengles/*.c) \
$(wildcard $(LOCAL_PATH)/src/render/software/*.c) \
$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \ $(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
$(wildcard $(LOCAL_PATH)/src/thread/*.c) \ $(wildcard $(LOCAL_PATH)/src/thread/*.c) \
$(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \ $(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \

4
src/render/opengles/SDL_renderer_gles.c
View file

@ -97,7 +97,7 @@ typedef struct
/* OpenGL ES functions */ /* OpenGL ES functions */
#define SDL_PROC(ret,func,params) ret (APIENTRY *func) params; #define SDL_PROC(ret,func,params) ret (APIENTRY *func) params;
#include "SDL_glesfuncs.h" #include "../../video/SDL_glesfuncs.h"
#undef SDL_PROC #undef SDL_PROC
} GLES_RenderData; } GLES_RenderData;
@ -154,7 +154,7 @@ GLES_LoadFunctions(GLES_RenderData * data)
#define SDL_PROC(ret,func,params) \ #define SDL_PROC(ret,func,params) \
data->func = func; data->func = func;
#include "SDL_glesfuncs.h" #include "../../video/SDL_glesfuncs.h"
#undef SDL_PROC #undef SDL_PROC
return 0; return 0;