From 3a205d663cb70559f5b1c5a9234709758c7f2052 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 8 Sep 2014 06:02:11 -0500 Subject: [PATCH] Fix building x86_64 on Android. Missed a define in x64MemTools for when the thought process was Android == ARM Also changes the variable we use for choosing which folders to copy to and from our jni file. This has changed since the x86_64 build target uses the library folder x86-64, which is stupid and annoying. --- Source/Core/Core/x64MemTools.cpp | 6 +++++- Source/Core/DolphinWX/CMakeLists.txt | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/x64MemTools.cpp b/Source/Core/Core/x64MemTools.cpp index ef9ea5c7ee..108b6ae6a2 100644 --- a/Source/Core/Core/x64MemTools.cpp +++ b/Source/Core/Core/x64MemTools.cpp @@ -243,7 +243,7 @@ void InstallExceptionHandler() CheckKR("mach_port_request_notification", mach_port_request_notification(mach_task_self(), port, MACH_NOTIFY_NO_SENDERS, 0, port, MACH_MSG_TYPE_MAKE_SEND_ONCE, &previous)); } -#elif !defined(ANDROID) +#elif defined(_POSIX_VERSION) static void sigsegv_handler(int sig, siginfo_t *info, void *raw_context) { @@ -281,6 +281,10 @@ void InstallExceptionHandler() sigaction(SIGSEGV, &sa, nullptr); } +#else + +#error Unsupported x86_64 platform! Report this if you support sigaction + #endif } // namespace diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index ebe9940c3d..45eb562e25 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -156,10 +156,10 @@ if(ANDROID) "-Wl,--no-whole-archive" ) add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD - COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/libs/${ANDROID_NDK_ABI_NAME} + COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/libs/${ANDROID_NDK_OUTPUT_ABI_NAME} ) add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD - COMMAND cp ARGS ${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/libs/${ANDROID_NDK_ABI_NAME}/ + COMMAND cp ARGS ${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_OUTPUT_ABI_NAME}/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/libs/${ANDROID_NDK_OUTPUT_ABI_NAME}/ ) add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/