From 06c65c6e9af87f4361c81b09653e72ba2795f0bb Mon Sep 17 00:00:00 2001 From: zilmar Date: Sun, 7 Aug 2016 15:08:41 +1000 Subject: [PATCH] [Andoird] Remove old usage of SDL --- Android/jni/Project64-bridge/Project64-bridge.mk | 3 +-- Android/jni/Project64-core/Project64-core.mk | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Android/jni/Project64-bridge/Project64-bridge.mk b/Android/jni/Project64-bridge/Project64-bridge.mk index a35b3f6a8..1893d983b 100644 --- a/Android/jni/Project64-bridge/Project64-bridge.mk +++ b/Android/jni/Project64-bridge/Project64-bridge.mk @@ -9,7 +9,7 @@ LOCAL_MODULE := Project64-bridge LOCAL_STATIC_LIBRARIES := common \ Project64-core \ -LOCAL_C_INCLUDES := $(SDL_INCLUDES) +LOCAL_C_INCLUDES := LOCAL_SRC_FILES := \ $(SRCDIR)/JavaBridge.cpp \ @@ -26,7 +26,6 @@ LOCAL_CFLAGS := \ LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) LOCAL_LDLIBS := \ - -lGLESv2 \ -llog \ include $(BUILD_SHARED_LIBRARY) diff --git a/Android/jni/Project64-core/Project64-core.mk b/Android/jni/Project64-core/Project64-core.mk index 058eb83d1..9d5731c7d 100644 --- a/Android/jni/Project64-core/Project64-core.mk +++ b/Android/jni/Project64-core/Project64-core.mk @@ -11,7 +11,6 @@ LOCAL_STATIC_LIBRARIES := common \ LOCAL_C_INCLUDES := ../ \ ../3rdParty/ \ - $(SDL_INCLUDES) \ LOCAL_SRC_FILES := \ $(SRCDIR)/AppInit.cpp \ @@ -41,9 +40,6 @@ LOCAL_SRC_FILES := \ $(SRCDIR)/N64System/Mips/SystemEvents.cpp \ $(SRCDIR)/N64System/Mips/SystemTiming.cpp \ $(SRCDIR)/N64System/Mips/TLBclass.cpp \ - $(SRCDIR)/N64System/Recompiler/x86/x86RecompilerOps.cpp \ - $(SRCDIR)/N64System/Recompiler/x86/x86ops.cpp \ - $(SRCDIR)/N64System/Recompiler/x86/x86RegInfo.cpp \ $(SRCDIR)/N64System/Recompiler/CodeBlock.cpp \ $(SRCDIR)/N64System/Recompiler/CodeSection.cpp \ $(SRCDIR)/N64System/Recompiler/SectionInfo.cpp \ @@ -54,6 +50,9 @@ LOCAL_SRC_FILES := \ $(SRCDIR)/N64System/Recompiler/RecompilerCodeLog.cpp \ $(SRCDIR)/N64System/Recompiler/RecompilerMemory.cpp \ $(SRCDIR)/N64System/Recompiler/RegBase.cpp \ + $(SRCDIR)/N64System/Recompiler/x86/x86ops.cpp \ + $(SRCDIR)/N64System/Recompiler/x86/x86RecompilerOps.cpp \ + $(SRCDIR)/N64System/Recompiler/x86/x86RegInfo.cpp \ $(SRCDIR)/N64System/CheatClass.cpp \ $(SRCDIR)/N64System/FramePerSecondClass.cpp \ $(SRCDIR)/N64System/N64Class.cpp \