(Android) Build fixes

This commit is contained in:
twinaphex 2014-09-06 03:39:37 +02:00
parent d7ca4d584c
commit 24500dfeb5
4 changed files with 2 additions and 5 deletions

View File

@ -38,7 +38,6 @@
#define main_entry android_app_entry
#define returntype void
#define signature_expand() data
#define returnfunc() exit(0)
#define return_negative() return
#define return_var(var) return
@ -54,7 +53,6 @@
#endif
#define returntype int
#define signature_expand() argc, argv
#define returnfunc() return 0
#define return_negative() return 1
#define return_var(var) return var

View File

@ -25,6 +25,7 @@
#endif
#if defined(ANDROID)
#include "platform/platform_android.h"
#define args_type() struct android_app*
#define signature() void* data
#define signature_expand() data

View File

@ -341,8 +341,6 @@ static unsigned input_frame(uint64_t trigger_state)
bool menu_iterate(void)
{
const char *path = NULL;
const char *label = NULL;
unsigned action = MENU_ACTION_NOOP;
static bool initial_held = true;
static bool first_held = false;

View File

@ -843,7 +843,7 @@ const struct rarch_key_map rarch_key_map_linux[] = {
//{ ?, RETROK_EXCLAIM },
//{ ?, RETROK_QUOTEDBL },
//{ ?, RETROK_HASH },
#ifdef ANDROID
#ifndef ANDROID
{ KEY_DOLLAR, RETROK_DOLLAR },
#endif
//{ ?, RETROK_AMPERSAND },