ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nacl: fixing affected android build

This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2015-07-29 05:17:16 +02:00
parent 17a4af378c
commit 289aa393c0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/linux/common.cpp
View File

@ -54,7 +54,7 @@ void sigill_handler(int sn, siginfo_t * si, void *segfault_ctx) {
} }
#endif #endif
#if defined(TARGET_NO_EXCEPTIONS) #if !defined(TARGET_NO_EXCEPTIONS)
void fault_handler (int sn, siginfo_t * si, void *segfault_ctx) void fault_handler (int sn, siginfo_t * si, void *segfault_ctx)
{ {
rei_host_context_t ctx; rei_host_context_t ctx;
@ -302,7 +302,7 @@ void linux_fix_personality() {
} }
void linux_rpi2_init() { void linux_rpi2_init() {
#if HOST_OS == OS_LINUX && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN) #if (HOST_OS == OS_LINUX) && !defined(_ANDROID) && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN)
void* handle; void* handle;
void (*rpi_bcm_init)(void); void (*rpi_bcm_init)(void);

2
core/linux/nixprof/nixprof.cpp
View File

@ -35,7 +35,7 @@
#include <set> #include <set>
#include "deps/libelf/elf.h" #include "deps/libelf/elf.h"
#include "context.h" #include "linux/context.h"
/** /**
@file CallStack_Android.h @file CallStack_Android.h