From 1f9f50a5579fb5754a3128e80d996c8558040507 Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Sun, 18 Nov 2012 23:21:36 +0100 Subject: [PATCH] Fix Android build on Linux --- Common/{ThunkArm.cpp => ThunkARM.cpp} | 0 android/ab.sh | 2 +- android/jni/Android.mk | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename Common/{ThunkArm.cpp => ThunkARM.cpp} (100%) diff --git a/Common/ThunkArm.cpp b/Common/ThunkARM.cpp similarity index 100% rename from Common/ThunkArm.cpp rename to Common/ThunkARM.cpp diff --git a/android/ab.sh b/android/ab.sh index 948024879..6190b3e54 100644 --- a/android/ab.sh +++ b/android/ab.sh @@ -1 +1 @@ -NDK_MODULE_PATH=..:../native/ext $NDK/ndk-build -j 3 +NDK_MODULE_PATH=..:../native/ext $NDK/ndk-build -j3 TARGET_PLATFORM=android-9 $* diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 53a379946..35b38da44 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -68,7 +68,7 @@ LOCAL_SRC_FILES := \ $(SRC)/Common/ThunkARM.cpp \ $(SRC)/Common/Misc.cpp \ $(SRC)/GPU/Math3D.cpp \ - $(SRC)/GPU/GpuState.cpp \ + $(SRC)/GPU/GPUState.cpp \ $(SRC)/GPU/GLES/Framebuffer.cpp \ $(SRC)/GPU/GLES/DisplayListInterpreter.cpp \ $(SRC)/GPU/GLES/TextureCache.cpp \ @@ -89,7 +89,7 @@ LOCAL_SRC_FILES := \ $(SRC)/Core/Loaders.cpp \ $(SRC)/Core/PSPLoaders.cpp \ $(SRC)/Core/MemMap.cpp \ - $(SRC)/Core/MemmapFunctions.cpp \ + $(SRC)/Core/MemMapFunctions.cpp \ $(SRC)/Core/System.cpp \ $(SRC)/Core/PSPMixer.cpp \ $(SRC)/Core/Debugger/Breakpoints.cpp \