mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-04 03:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android) Enable and fix warnings.

Browse Source
This commit is contained in:
notaz 2012-12-26 03:01:02 +02:00
parent fff846d579
commit b1e8c84f55
6 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/native/jni/Android.mk
View File

@ -58,7 +58,7 @@ ifeq ($(DEBUG_INPUT), 1)
LOCAL_CFLAGS += -DRARCH_INPUT_DEBUG LOCAL_CFLAGS += -DRARCH_INPUT_DEBUG
endif endif
LOCAL_CFLAGS += -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DWANT_RZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DRARCH_GPU_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 LOCAL_CFLAGS += -Wall -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DWANT_RZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DRARCH_GPU_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99
LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 $(LOGGER_LDLIBS) -ldl LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 $(LOGGER_LDLIBS) -ldl
#LOCAL_C_INCLUDES += $(LIBXML_PATH) #LOCAL_C_INCLUDES += $(LIBXML_PATH)

5
android/native/jni/cpufeatures.c
View File

@ -129,7 +129,7 @@ extract_cpuinfo_field(char* buffer, int buflen, const char* field)
int fieldlen = strlen(field); int fieldlen = strlen(field);
char* bufend = buffer + buflen; char* bufend = buffer + buflen;
char* result = NULL; char* result = NULL;
int len, ignore; int len;
const char *p, *q; const char *p, *q;
/* Look for first field occurence, and ensures it starts the line. /* Look for first field occurence, and ensures it starts the line.
@ -400,9 +400,6 @@ android_cpuInit(void)
#ifdef __ARM_ARCH__ #ifdef __ARM_ARCH__
{ {
char* features = NULL;
char* architecture = NULL;
/* Extract architecture from the "CPU Architecture" field. /* Extract architecture from the "CPU Architecture" field.
* The list is well-known, unlike the the output of * The list is well-known, unlike the the output of
* the 'Processor' field which can vary greatly. * the 'Processor' field which can vary greatly.

1
android/native/jni/input_android.c
View File

@ -338,7 +338,6 @@ static void android_input_poll(void *data)
if(type_event == AINPUT_EVENT_TYPE_MOTION) if(type_event == AINPUT_EVENT_TYPE_MOTION)
{ {
action = AMotionEvent_getAction(event); action = AMotionEvent_getAction(event);
int8_t motion_action = action & AMOTION_EVENT_ACTION_MASK;
size_t motion_pointer = action >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT; size_t motion_pointer = action >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
float x = AMotionEvent_getX(event, motion_pointer); float x = AMotionEvent_getX(event, motion_pointer);

2
android/phoenix/jni/Android.mk
View File

@ -54,7 +54,7 @@ ifeq ($(PERF_TEST), 1)
LOCAL_CFLAGS += -DPERF_TEST LOCAL_CFLAGS += -DPERF_TEST
endif endif
LOCAL_CFLAGS += -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DWANT_RZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DRARCH_GPU_PERFORMANCE_MODE -DHAVE_OVERLAY -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 LOCAL_CFLAGS += -Wall -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DWANT_RZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DRARCH_GPU_PERFORMANCE_MODE -DHAVE_OVERLAY -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99
LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl
LOCAL_C_INCLUDES += $(LIBXML_PATH) LOCAL_C_INCLUDES += $(LIBXML_PATH)

3
gfx/context/androidegl_ctx.c
View File

@ -124,7 +124,6 @@ static bool gfx_ctx_init(void)
EGLint num_config; EGLint num_config;
EGLint egl_version_major, egl_version_minor; EGLint egl_version_major, egl_version_minor;
EGLint format; EGLint format;
GLfloat ratio;
EGLint context_attributes[] = { EGLint context_attributes[] = {
EGL_CONTEXT_CLIENT_VERSION, 2, EGL_CONTEXT_CLIENT_VERSION, 2,
@ -321,9 +320,9 @@ static void gfx_ctx_set_filtering(unsigned index, bool set_smooth)
static void gfx_ctx_set_fbo(unsigned mode) static void gfx_ctx_set_fbo(unsigned mode)
{ {
#ifdef HAVE_FBO
gl_t *gl = driver.video_data; gl_t *gl = driver.video_data;
#ifdef HAVE_FBO
switch(mode) switch(mode)
{ {
case FBO_DEINIT: case FBO_DEINIT:

3
gfx/gl.c
View File

@ -1279,8 +1279,6 @@ static void gl_free(void *data)
static void gl_set_nonblock_state(void *data, bool state) static void gl_set_nonblock_state(void *data, bool state)
{ {
gl_t *gl = (gl_t*)data;
RARCH_LOG("GL VSync => %s\n", state ? "off" : "on"); RARCH_LOG("GL VSync => %s\n", state ? "off" : "on");
context_swap_interval_func(state ? 0 : 1); context_swap_interval_func(state ? 0 : 1);
} }
@ -1598,7 +1596,6 @@ static bool gl_alive(void *data)
static bool gl_focus(void *data) static bool gl_focus(void *data)
{ {
gl_t *gl = (gl_t*)data;
return context_has_focus_func(); return context_has_focus_func();
} }