diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk index e9fd7a21fa..44d26bfd79 100644 --- a/android/native/jni/Android.mk +++ b/android/native/jni/Android.mk @@ -52,9 +52,10 @@ ifeq ($(GLES),3) LOCAL_CFLAGS += -DHAVE_OPENGLES3 else GLES_LIB := -lGLESv2 + LOCAL_CFLAGS += -DHAVE_OPENGLES2 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 +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 -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 LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl diff --git a/android/native/jni/Application.mk b/android/native/jni/Application.mk new file mode 100644 index 0000000000..e5fb02e9b5 --- /dev/null +++ b/android/native/jni/Application.mk @@ -0,0 +1,6 @@ +ifeq ($(GLES),3) + APP_PLATFORM := android-18 +else + APP_PLATFORM := android-9 +endif +APP_ABI := all