From 03f8528315fa46c95991a34f3325d7b33ae5538c Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Sat, 02 May 2020 21:48:36 +0000
Subject: [PATCH] Update source to SDL2 2.0.12
---
source/Android.mk | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/source/Android.mk b/source/Android.mk
index 9ce879a..6424655 100644
--- a/source/Android.mk
+++ b/source/Android.mk
@@ -20,6 +20,7 @@
$(wildcard $(LOCAL_PATH)/src/audio/*.c) \
$(wildcard $(LOCAL_PATH)/src/audio/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \
+ $(wildcard $(LOCAL_PATH)/src/audio/openslES/*.c) \
$(LOCAL_PATH)/src/atomic/SDL_atomic.c.arm \
$(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \
$(wildcard $(LOCAL_PATH)/src/core/android/*.c) \
@@ -53,11 +54,33 @@
LOCAL_SHARED_LIBRARIES := hidapi
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES
-LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
+LOCAL_CFLAGS += \
+ -Wall -Wextra \
+ -Wdocumentation \
+ -Wdocumentation-unknown-command \
+ -Wmissing-prototypes \
+ -Wunreachable-code-break \
+ -Wunneeded-internal-declaration \
+ -Wmissing-variable-declarations \
+ -Wfloat-conversion \
+ -Wshorten-64-to-32 \
+ -Wunreachable-code-return \
+ -Wshift-sign-overflow \
+ -Wstrict-prototypes \
+ -Wkeyword-macro \
+
+
+# Warnings we haven't fixed (yet)
+LOCAL_CFLAGS += -Wno-unused-parameter -Wno-sign-compare
+
+
+LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -lOpenSLES -llog -landroid
ifeq ($(NDK_DEBUG),1)
cmd-strip :=
endif
+
+LOCAL_STATIC_LIBRARIES := cpufeatures
include $(BUILD_SHARED_LIBRARY)
@@ -108,3 +131,6 @@
LOCAL_LDLIBS := -llog
include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,android/cpufeatures)
+
--
Gitblit v1.9.3