From 52cb398804a4f7f4e31e2040bbabd1bf90c581f6 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 13 Jul 2013 10:32:06 -0500 Subject: [PATCH] [Android] Actually push the library file to the correct location. --- Source/Core/DolphinWX/CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 7f876b43f5..1ad6c56047 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -177,11 +177,20 @@ if(ANDROID) ${LIBS} "-Wl,--no-whole-archive" ) + if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "mips") + set (SO_TARGET "mips") + endif() + if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm") + set (SO_TARGET "armeabi-v7a") + endif() + if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686") + set (SO_TARGET "x86") + endif() add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD - COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/libs/armeabi-v7a/ + COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/libs/${SO_TARGET} ) add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD - COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/libs/armeabi-v7a/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/libs/armeabi-v7a/ + COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/libs/${SO_TARGET}/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/libs/${SO_TARGET}/ ) add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/