From 3b05ee110c1f029fe26b92eb532380cba1c639d8 Mon Sep 17 00:00:00 2001
From: Mario Liebisch <mario.liebisch@gmail.com>
Date: Tue, 23 Dec 2014 13:23:50 +0100
Subject: [PATCH] Android: Fixed building and linking

---
 extlibs/headers/ogg/config_types.h | 25 +++++++++++++++++++++++++
 src/SFML/Android.mk                |  4 ++--
 src/SFML/Main/SFMLActivity.cpp     |  1 -
 3 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 extlibs/headers/ogg/config_types.h

diff --git a/extlibs/headers/ogg/config_types.h b/extlibs/headers/ogg/config_types.h
new file mode 100644
index 0000000000..4b00047a0d
--- /dev/null
+++ b/extlibs/headers/ogg/config_types.h
@@ -0,0 +1,25 @@
+#ifndef __CONFIG_TYPES_H__
+#define __CONFIG_TYPES_H__
+
+/* these are filled in by configure */
+#define INCLUDE_INTTYPES_H 1
+#define INCLUDE_STDINT_H 1
+#define INCLUDE_SYS_TYPES_H 1
+
+#if INCLUDE_INTTYPES_H
+#  include <inttypes.h>
+#endif
+#if INCLUDE_STDINT_H
+#  include <stdint.h>
+#endif
+#if INCLUDE_SYS_TYPES_H
+#  include <sys/types.h>
+#endif
+
+typedef int16_t ogg_int16_t;
+typedef uint16_t ogg_uint16_t;
+typedef int32_t ogg_int32_t;
+typedef uint32_t ogg_uint32_t;
+typedef int64_t ogg_int64_t;
+
+#endif
diff --git a/src/SFML/Android.mk b/src/SFML/Android.mk
index d3ec278b1a..f4f586d4bb 100644
--- a/src/SFML/Android.mk
+++ b/src/SFML/Android.mk
@@ -42,7 +42,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := sfml-audio
 LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-audio.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES := sfml-window sfml-system openal sndfile
+LOCAL_SHARED_LIBRARIES := sfml-window sfml-system openal
 
 prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
 prebuilt := $(strip $(wildcard $(prebuilt_path)))
@@ -132,7 +132,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := sfml-audio-d
 LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-audio-d.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES := sfml-window-d sfml-system-d openal sndfile
+LOCAL_SHARED_LIBRARIES := sfml-window-d sfml-system-d openal
 
 prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
 prebuilt := $(strip $(wildcard $(prebuilt_path)))
diff --git a/src/SFML/Main/SFMLActivity.cpp b/src/SFML/Main/SFMLActivity.cpp
index 549303da61..57b51e76d8 100644
--- a/src/SFML/Main/SFMLActivity.cpp
+++ b/src/SFML/Main/SFMLActivity.cpp
@@ -160,7 +160,6 @@ void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_
 
     // Load our libraries in reverse order
     loadLibrary("c++_shared", lJNIEnv, ObjectActivityInfo);
-    loadLibrary("sndfile", lJNIEnv, ObjectActivityInfo);
     loadLibrary("openal", lJNIEnv, ObjectActivityInfo);
 
 #if !defined(SFML_DEBUG)