Merge pull request #367 from raysan5/develop

Integrate Develop branch

26 files changed, 37 insertions, 32 deletions

diff --git a/src/external/android/native_app_glue/Android.mk b/src/external/android/native_app_glue/Android.mk
deleted file mode 100644
index 00252fcb..00000000
--- a/src/external/android/native_app_glue/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE:= android_native_app_glue
-LOCAL_SRC_FILES:= android_native_app_glue.c
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
-LOCAL_EXPORT_LDLIBS := -llog
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/src/external/android/native_app_glue/android_native_app_glue.c b/src/external/android/native_app_glue/android_native_app_glue.c
index d503d8da..7eada086 100644
--- a/src/external/android/native_app_glue/android_native_app_glue.c
+++ b/src/external/android/native_app_glue/android_native_app_glue.c
@@ -420,8 +420,9 @@ static void onInputQueueDestroyed(ANativeActivity* activity, AInputQueue* queue)
     android_app_set_input((struct android_app*)activity->instance, NULL);
 }
 
-void ANativeActivity_onCreate(ANativeActivity* activity,
-        void* savedState, size_t savedStateSize) {
+JNIEXPORT
+void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState,
+                              size_t savedStateSize) {
     LOGV("Creating: %p\n", activity);
     activity->callbacks->onDestroy = onDestroy;
     activity->callbacks->onStart = onStart;
diff --git a/src/external/android/native_app_glue/android_native_app_glue.h b/src/external/android/native_app_glue/android_native_app_glue.h
index 97202e09..c99d6e12 100644
--- a/src/external/android/native_app_glue/android_native_app_glue.h
+++ b/src/external/android/native_app_glue/android_native_app_glue.h
@@ -332,9 +332,14 @@ void android_app_pre_exec_cmd(struct android_app* android_app, int8_t cmd);
 void android_app_post_exec_cmd(struct android_app* android_app, int8_t cmd);
 
 /**
- * Dummy function you can call to ensure glue code isn't stripped.
+ * Dummy function that used to be used to prevent the linker from stripping app
+ * glue code. No longer necessary, since __attribute__((visibility("default")))
+ * does this for us.
  */
-void app_dummy();
+__attribute__((
+    deprecated("Calls to app_dummy are no longer necessary. See "
+               "https://github.com/android-ndk/ndk/issues/381."))) void
+app_dummy();
 
 /**
  * This is the function that application code must implement, representing
diff --git a/src/external/glfw3/lib/linux/libglfw3.a b/src/external/glfw3/lib/linux/libglfw3.a
deleted file mode 100644
index 84cc1d20..00000000
--- a/src/external/glfw3/lib/linux/libglfw3.a
+++ /dev/null
diff --git a/src/external/glfw3/lib/osx/libglfw.3.0.dylib b/src/external/glfw3/lib/osx/libglfw.3.0.dylib
deleted file mode 100644
index 15674573..00000000
--- a/src/external/glfw3/lib/osx/libglfw.3.0.dylib
+++ /dev/null
diff --git a/src/external/glfw3/lib/osx/libglfw.3.dylib b/src/external/glfw3/lib/osx/libglfw.3.dylib
deleted file mode 100644
index cd20112e..00000000
--- a/src/external/glfw3/lib/osx/libglfw.3.dylib
+++ /dev/null
@@ -1 +0,0 @@
-libglfw.3.0.dylib
\ No newline at end of file
diff --git a/src/external/glfw3/lib/osx/libglfw.dylib b/src/external/glfw3/lib/osx/libglfw.dylib
deleted file mode 100644
index d4bd51e1..00000000
--- a/src/external/glfw3/lib/osx/libglfw.dylib
+++ /dev/null
@@ -1 +0,0 @@
-libglfw.3.dylib
\ No newline at end of file
diff --git a/src/external/glfw3/lib/win32/glfw3.dll b/src/external/glfw3/lib/win32/glfw3.dll
deleted file mode 100644
index 9f5d40f6..00000000
--- a/src/external/glfw3/lib/win32/glfw3.dll
+++ /dev/null
diff --git a/src/external/glfw3/lib/win32/glfw3.lib b/src/external/glfw3/lib/win32/glfw3.lib
deleted file mode 100644
index 741756ab..00000000
--- a/src/external/glfw3/lib/win32/glfw3.lib
+++ /dev/null
diff --git a/src/external/glfw3/lib/win32/libglfw3.a b/src/external/glfw3/lib/win32/libglfw3.a
deleted file mode 100644
index d50ffa72..00000000
--- a/src/external/glfw3/lib/win32/libglfw3.a
+++ /dev/null
diff --git a/src/external/glfw3/lib/win32/libglfw3dll.a b/src/external/glfw3/lib/win32/libglfw3dll.a
deleted file mode 100644
index a42a400b..00000000
--- a/src/external/glfw3/lib/win32/libglfw3dll.a
+++ /dev/null
diff --git a/src/external/openal_soft/include/AL/al.h b/src/external/include/AL/al.h
index 413b3833..413b3833 100644
--- a/src/external/openal_soft/include/AL/al.h
+++ b/src/external/include/AL/al.h
diff --git a/src/external/openal_soft/include/AL/alc.h b/src/external/include/AL/alc.h
index 294e8b33..294e8b33 100644
--- a/src/external/openal_soft/include/AL/alc.h
+++ b/src/external/include/AL/alc.h
diff --git a/src/external/openal_soft/include/AL/alext.h b/src/external/include/AL/alext.h
index 50ad10ec..4b9a1553 100644
--- a/src/external/openal_soft/include/AL/alext.h
+++ b/src/external/include/AL/alext.h
@@ -448,6 +448,17 @@ AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index);
 #endif
 #endif
 
+#ifndef AL_SOFT_source_spatialize
+#define AL_SOFT_source_spatialize
+#define AL_SOURCE_SPATIALIZE_SOFT                0x1214
+#define AL_AUTO_SOFT                             0x0002
+#endif
+
+#ifndef ALC_SOFT_output_limiter
+#define ALC_SOFT_output_limiter
+#define ALC_OUTPUT_LIMITER_SOFT                  0x199A
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/external/openal_soft/include/AL/efx-creative.h b/src/external/include/AL/efx-creative.h
index 0a04c982..0a04c982 100644
--- a/src/external/openal_soft/include/AL/efx-creative.h
+++ b/src/external/include/AL/efx-creative.h
diff --git a/src/external/openal_soft/include/AL/efx-presets.h b/src/external/include/AL/efx-presets.h
index 8539fd51..8539fd51 100644
--- a/src/external/openal_soft/include/AL/efx-presets.h
+++ b/src/external/include/AL/efx-presets.h
diff --git a/src/external/openal_soft/include/AL/efx.h b/src/external/include/AL/efx.h
index 57766983..57766983 100644
--- a/src/external/openal_soft/include/AL/efx.h
+++ b/src/external/include/AL/efx.h
diff --git a/src/external/openal_soft/COPYING b/src/external/include/AL_COPYING
index d0c89786..d0c89786 100644
--- a/src/external/openal_soft/COPYING
+++ b/src/external/include/AL_COPYING
diff --git a/src/external/glfw3/include/GLFW/glfw3.h b/src/external/include/GLFW/glfw3.h
index 5a0c4508..5a0c4508 100644
--- a/src/external/glfw3/include/GLFW/glfw3.h
+++ b/src/external/include/GLFW/glfw3.h
diff --git a/src/external/glfw3/include/GLFW/glfw3native.h b/src/external/include/GLFW/glfw3native.h
index 30e1a570..30e1a570 100644
--- a/src/external/glfw3/include/GLFW/glfw3native.h
+++ b/src/external/include/GLFW/glfw3native.h
diff --git a/src/external/glfw3/COPYING.txt b/src/external/include/GLFW_COPYING.txt
index ad16462a..ad16462a 100644
--- a/src/external/glfw3/COPYING.txt
+++ b/src/external/include/GLFW_COPYING.txt
diff --git a/src/external/openal_soft/lib/android/libopenal.so b/src/external/openal_soft/lib/android/libopenal.so
deleted file mode 100644
index e384d9ad..00000000
--- a/src/external/openal_soft/lib/android/libopenal.so
+++ /dev/null
diff --git a/src/external/openal_soft/lib/win32/OpenAL32.dll b/src/external/openal_soft/lib/win32/OpenAL32.dll
deleted file mode 100644
index 1e3bddd5..00000000
--- a/src/external/openal_soft/lib/win32/OpenAL32.dll
+++ /dev/null
diff --git a/src/external/openal_soft/lib/win32/libOpenAL32.a b/src/external/openal_soft/lib/win32/libOpenAL32.a
deleted file mode 100644
index 3c0df3c7..00000000
--- a/src/external/openal_soft/lib/win32/libOpenAL32.a
+++ /dev/null
diff --git a/src/external/openal_soft/lib/win32/libOpenAL32dll.a b/src/external/openal_soft/lib/win32/libOpenAL32dll.a
deleted file mode 100644
index 1c4c63c8..00000000
--- a/src/external/openal_soft/lib/win32/libOpenAL32dll.a
+++ /dev/null
diff --git a/src/external/gif.h b/src/external/rgif.h
index c38cddb7..f26f67d1 100644
--- a/src/external/gif.h
+++ b/src/external/rgif.h
@@ -1,7 +1,7 @@
 /**********************************************************************************************
 *
-*   gif.h by Charlie Tangora [ctangora -at- gmail -dot- com]
-*   adapted to C99 and reformatted by Ramon Santamaria (@raysan5)
+*   rgif.h original implementation by Charlie Tangora [ctangora -at- gmail -dot- com]
+*   adapted to C99, reformatted and renamed by Ramon Santamaria (@raysan5)
 *
 *   This file offers a simple, very limited way to create animated GIFs directly in code.
 *
@@ -17,7 +17,7 @@
 *
 *   CONFIGURATION:
 *
-*   #define GIF_IMPLEMENTATION
+*   #define RGIF_IMPLEMENTATION
 *       Generates the implementation of the library into the included file.
 *       If not defined, the library is in header only mode and can be included in other headers
 *       or source files without problems. But only ONE file should hold the implementation.
@@ -56,14 +56,14 @@
 
 #include <stdio.h>          // Required for: FILE
 
-//#define GIF_STATIC
-#ifdef GIF_STATIC
-    #define GIFDEF static              // Functions just visible to module including this file
+//#define RGIF_STATIC
+#ifdef RGIF_STATIC
+    #define RGIFDEF static              // Functions just visible to module including this file
 #else
     #ifdef __cplusplus
-        #define GIFDEF extern "C"      // Functions visible from other files (no name mangling of functions in C++)
+        #define RGIFDEF extern "C"      // Functions visible from other files (no name mangling of functions in C++)
     #else
-        #define GIFDEF extern          // Functions visible from other files
+        #define RGIFDEF extern          // Functions visible from other files
     #endif
 #endif
 
@@ -72,9 +72,9 @@
 //----------------------------------------------------------------------------------
 
 // NOTE: By default use bitDepth = 8, dither = false
-GIFDEF bool GifBegin(const char *filename, unsigned int width, unsigned int height, unsigned int delay, unsigned int bitDepth, bool dither);
-GIFDEF bool GifWriteFrame(const unsigned char *image, unsigned int width, unsigned int height, unsigned int delay, int bitDepth, bool dither);
-GIFDEF bool GifEnd();
+RGIFDEF bool GifBegin(const char *filename, unsigned int width, unsigned int height, unsigned int delay, unsigned int bitDepth, bool dither);
+RGIFDEF bool GifWriteFrame(const unsigned char *image, unsigned int width, unsigned int height, unsigned int delay, int bitDepth, bool dither);
+RGIFDEF bool GifEnd();
 
 #endif // GIF_H
 
@@ -85,7 +85,7 @@ GIFDEF bool GifEnd();
 *
 ************************************************************************************/
 
-#if defined(GIF_IMPLEMENTATION)
+#if defined(RGIF_IMPLEMENTATION)
 
 #include <stdio.h>          // Required for: FILE, fopen(), fclose()
 #include <string.h>         // Required for: memcpy()
@@ -186,7 +186,7 @@ static void GifWriteLzwImage(FILE *f, unsigned char *image, unsigned int left, u
 // Creates a gif file
 // NOTE: Initializes internal file pointer (only one gif recording at a time)
 // The delay value is the time between frames in hundredths of a second - note that not all viewers pay much attention to this value.
-GIFDEF bool GifBegin(const char *filename, unsigned int width, unsigned int height, unsigned int delay, unsigned int bitDepth, bool dither)
+RGIFDEF bool GifBegin(const char *filename, unsigned int width, unsigned int height, unsigned int delay, unsigned int bitDepth, bool dither)
 {
 #if _MSC_VER >= 1400
 	gifFile = 0;
@@ -248,7 +248,7 @@ GIFDEF bool GifBegin(const char *filename, unsigned int width, unsigned int heig
 // NOTE: gifFile should have been initialized with GifBegin()
 // AFAIK, it is legal to use different bit depths for different frames of an image -
 // this may be handy to save bits in animations that don't change much.
-GIFDEF bool GifWriteFrame(const unsigned char *image, unsigned int width, unsigned int height, unsigned int delay, int bitDepth, bool dither)
+RGIFDEF bool GifWriteFrame(const unsigned char *image, unsigned int width, unsigned int height, unsigned int delay, int bitDepth, bool dither)
 {
     if (!gifFile) return false;
     
@@ -268,7 +268,7 @@ GIFDEF bool GifWriteFrame(const unsigned char *image, unsigned int width, unsign
 // Writes the EOF code, closes the file handle, and frees temp memory used by a GIF.
 // Many if not most viewers will still display a GIF properly if the EOF code is missing,
 // but it's still a good idea to write it out.
-GIFDEF bool GifEnd()
+RGIFDEF bool GifEnd()
 {
     if (!gifFile) return false;
     
@@ -910,4 +910,4 @@ static void GifWriteLzwImage(FILE *f, unsigned char *image, unsigned int left, u
     GIF_TEMP_FREE(codetree);
 }
 
-#endif // GIF_IMPLEMENTATION
+#endif // RGIF_IMPLEMENTATION