Merge pull request #61 from Orphis/androidbuild

Fix Android build on Linux
This commit is contained in:
Henrik Rydgård committed 2012-11-18 14:36:13 -08:00
commit b1676f8370
3 files changed
+3 -3

No files matched your search

File renamed without changes.
+1 -1
View File
@@ -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 $*
+2 -2
View File
@@ -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 \