From 4dcf25b9d7a0024dd78003c6823aefb058b4626a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 30 Apr 2014 03:31:49 +0200 Subject: [PATCH] (Android) Fix JNI build --- android/native/jni/Android.mk | 2 +- griffin/griffin.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk index 511584afc2..5f9e1772a4 100644 --- a/android/native/jni/Android.mk +++ b/android/native/jni/Android.mk @@ -53,7 +53,7 @@ else GLES_LIB := -lGLESv2 endif -LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_SCREENSHOTS -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -I../../../deps/miniz -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_CAMERA -DRARCH_INTERNAL -DHAVE_LOCATION -DHAVE_CC_RESAMPLER +LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_SCREENSHOTS -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -I../../../deps/miniz -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_CAMERA -DRARCH_INTERNAL -DHAVE_LOCATION -DHAVE_CC_RESAMPLER LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl diff --git a/griffin/griffin.c b/griffin/griffin.c index 2f8bdb3ae7..d5a1ebe025 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -196,10 +196,6 @@ VIDEO DRIVER #include "../gfx/fbdev.c" #endif -#ifdef HAVE_DYLIB -#include "../gfx/ext_gfx.c" -#endif - #include "../gfx/gfx_common.c" #ifdef _XBOX @@ -455,10 +451,6 @@ AUDIO #include "../audio/null.c" #endif -#ifdef HAVE_DYLIB -#include "../audio/ext_audio.c" -#endif - /*============================================================ DRIVERS ============================================================ */