Reorganize external libraries - BREAKING CHANGE -

Moved all external libraries used by raylib to external folder inside
raylib src. Makefile has already been update and also the different
includes in raylib modules.

39 files changed, 28 insertions, 27 deletions

diff --git a/external/glfw3/glfw3.dll b/external/glfw3/glfw3.dll
deleted file mode 100644
index b5457bde..00000000
--- a/external/glfw3/glfw3.dll
+++ /dev/null
diff --git a/external/openal_soft/openal32.dll b/external/openal_soft/openal32.dll
deleted file mode 100644
index 1e3bddd5..00000000
--- a/external/openal_soft/openal32.dll
+++ /dev/null
diff --git a/src/Makefile b/src/Makefile
index 244675e2..7f15bd2f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -81,14 +81,14 @@ CFLAGS = -O1 -Wall -std=gnu99 -fgnu89-inline -Wno-missing-braces
 
 # define any directories containing required header files
 ifeq ($(PLATFORM),PLATFORM_RPI)
-    INCLUDES = -I. -I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads
+    INCLUDES = -I. -Iexternal -I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads
 else
-    INCLUDES = -I. -I../src
-# external libraries headers
-# GLFW3
-    INCLUDES += -I../external/glfw3/include
-# OpenAL Soft
-    INCLUDES += -I../external/openal_soft/include
+# STB libraries and others
+    INCLUDES = -I. -Iexternal
+# GLFW3 library
+    INCLUDES += -Iexternal/glfw3/include
+# OpenAL Soft library
+    INCLUDES += -Iexternal/openal_soft/include
 endif
 
 # define all object files required
@@ -121,10 +121,6 @@ core.o: core.c
 rlgl.o: rlgl.c
 	$(CC) -c rlgl.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS)
 
-# compile glad module
-glad.o: glad.c
-	$(CC) -c glad.c $(CFLAGS) $(INCLUDES)
-
 # compile shapes module
 shapes.o: shapes.c
 	$(CC) -c shapes.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS)
@@ -145,10 +141,6 @@ models.o: models.c
 audio.o: audio.c
 	$(CC) -c audio.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
 
-# compile stb_vorbis library
-stb_vorbis.o: stb_vorbis.c
-	$(CC) -c stb_vorbis.c -O1 $(INCLUDES) -D$(PLATFORM)
-
 # compile utils module
 utils.o: utils.c
 	$(CC) -c utils.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
@@ -161,6 +153,14 @@ camera.o: camera.c
 gestures.o: gestures.c
 	$(CC) -c gestures.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
 
+# compile glad module
+glad.o: external/glad.c
+	$(CC) -c external/glad.c $(CFLAGS) $(INCLUDES)
+
+# compile stb_vorbis library
+stb_vorbis.o: external/stb_vorbis.c
+	$(CC) -c external/stb_vorbis.c -O1 $(INCLUDES) -D$(PLATFORM)
+
 # clean everything
 clean:
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
diff --git a/src/audio.c b/src/audio.c
index b5514b12..ad1d7eba 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -51,13 +51,13 @@
 #endif
 
 //#define STB_VORBIS_HEADER_ONLY
-#include "stb_vorbis.h"         // OGG loading functions
+#include "external/stb_vorbis.h"    // OGG loading functions
 
 #define JAR_XM_IMPLEMENTATION
-#include "jar_xm.h"             // XM loading functions
+#include "external/jar_xm.h"        // XM loading functions
 
 #define JAR_MOD_IMPLEMENTATION
-#include "jar_mod.h"            // MOD loading functions
+#include "external/jar_mod.h"       // MOD loading functions
 
 //----------------------------------------------------------------------------------
 // Defines and Macros
diff --git a/src/core.c b/src/core.c
index d229e1f8..4ba7505b 100644
--- a/src/core.c
+++ b/src/core.c
@@ -55,11 +55,11 @@
 #include <errno.h>          // Macros for reporting and retrieving error conditions through error codes
 
 #if defined(PLATFORM_OCULUS)
-    #define PLATFORM_DESKTOP    // Enable PLATFORM_DESKTOP code-base
+    #define PLATFORM_DESKTOP      // Enable PLATFORM_DESKTOP code-base
 #endif
 
 #if defined(PLATFORM_DESKTOP)
-    #include "glad.h"           // GLAD library: Manage OpenGL headers and extensions
+    #include "external/glad.h"    // GLAD library: Manage OpenGL headers and extensions
 #endif
 
 #if defined(PLATFORM_OCULUS)
diff --git a/src/glad.c b/src/external/glad.c
index aace05a7..aace05a7 100644
--- a/src/glad.c
+++ b/src/external/glad.c
diff --git a/src/glad.h b/src/external/glad.h
index 56bb622d..56bb622d 100644
--- a/src/glad.h
+++ b/src/external/glad.h
diff --git a/external/glfw3/COPYING.txt b/src/external/glfw3/COPYING.txt
index 8e1af084..8e1af084 100644
--- a/external/glfw3/COPYING.txt
+++ b/src/external/glfw3/COPYING.txt
diff --git a/external/glfw3/include/GLFW/glfw3.h b/src/external/glfw3/include/GLFW/glfw3.h
index 89414491..89414491 100644
--- a/external/glfw3/include/GLFW/glfw3.h
+++ b/src/external/glfw3/include/GLFW/glfw3.h
diff --git a/external/glfw3/include/GLFW/glfw3native.h b/src/external/glfw3/include/GLFW/glfw3native.h
index b3ce7482..b3ce7482 100644
--- a/external/glfw3/include/GLFW/glfw3native.h
+++ b/src/external/glfw3/include/GLFW/glfw3native.h
diff --git a/external/glfw3/lib/linux/libglfw3.a b/src/external/glfw3/lib/linux/libglfw3.a
index 84cc1d20..84cc1d20 100644
--- a/external/glfw3/lib/linux/libglfw3.a
+++ b/src/external/glfw3/lib/linux/libglfw3.a
diff --git a/external/glfw3/lib/osx/libglfw.3.0.dylib b/src/external/glfw3/lib/osx/libglfw.3.0.dylib
index 15674573..15674573 100644
--- a/external/glfw3/lib/osx/libglfw.3.0.dylib
+++ b/src/external/glfw3/lib/osx/libglfw.3.0.dylib
diff --git a/external/glfw3/lib/osx/libglfw.3.dylib b/src/external/glfw3/lib/osx/libglfw.3.dylib
index cd20112e..cd20112e 100644
--- a/external/glfw3/lib/osx/libglfw.3.dylib
+++ b/src/external/glfw3/lib/osx/libglfw.3.dylib
diff --git a/external/glfw3/lib/osx/libglfw.dylib b/src/external/glfw3/lib/osx/libglfw.dylib
index d4bd51e1..d4bd51e1 100644
--- a/external/glfw3/lib/osx/libglfw.dylib
+++ b/src/external/glfw3/lib/osx/libglfw.dylib
diff --git a/external/glfw3/lib/win32/libglfw3.a b/src/external/glfw3/lib/win32/libglfw3.a
index fc920396..fc920396 100644
--- a/external/glfw3/lib/win32/libglfw3.a
+++ b/src/external/glfw3/lib/win32/libglfw3.a
diff --git a/external/glfw3/lib/win32/libglfw3dll.a b/src/external/glfw3/lib/win32/libglfw3dll.a
index f1bd73b1..f1bd73b1 100644
--- a/external/glfw3/lib/win32/libglfw3dll.a
+++ b/src/external/glfw3/lib/win32/libglfw3dll.a
diff --git a/src/jar_mod.h b/src/external/jar_mod.h
index 2ddc61d1..2ddc61d1 100644
--- a/src/jar_mod.h
+++ b/src/external/jar_mod.h
diff --git a/src/jar_xm.h b/src/external/jar_xm.h
index f9ddb511..f9ddb511 100644
--- a/src/jar_xm.h
+++ b/src/external/jar_xm.h
diff --git a/external/openal_soft/COPYING b/src/external/openal_soft/COPYING
index d0c89786..d0c89786 100644
--- a/external/openal_soft/COPYING
+++ b/src/external/openal_soft/COPYING
diff --git a/external/openal_soft/include/AL/al.h b/src/external/openal_soft/include/AL/al.h
index 413b3833..413b3833 100644
--- a/external/openal_soft/include/AL/al.h
+++ b/src/external/openal_soft/include/AL/al.h
diff --git a/external/openal_soft/include/AL/alc.h b/src/external/openal_soft/include/AL/alc.h
index 294e8b33..294e8b33 100644
--- a/external/openal_soft/include/AL/alc.h
+++ b/src/external/openal_soft/include/AL/alc.h
diff --git a/external/openal_soft/include/AL/alext.h b/src/external/openal_soft/include/AL/alext.h
index 6af581aa..6af581aa 100644
--- a/external/openal_soft/include/AL/alext.h
+++ b/src/external/openal_soft/include/AL/alext.h
diff --git a/external/openal_soft/include/AL/efx-creative.h b/src/external/openal_soft/include/AL/efx-creative.h
index 0a04c982..0a04c982 100644
--- a/external/openal_soft/include/AL/efx-creative.h
+++ b/src/external/openal_soft/include/AL/efx-creative.h
diff --git a/external/openal_soft/include/AL/efx-presets.h b/src/external/openal_soft/include/AL/efx-presets.h
index 8539fd51..8539fd51 100644
--- a/external/openal_soft/include/AL/efx-presets.h
+++ b/src/external/openal_soft/include/AL/efx-presets.h
diff --git a/external/openal_soft/include/AL/efx.h b/src/external/openal_soft/include/AL/efx.h
index 57766983..57766983 100644
--- a/external/openal_soft/include/AL/efx.h
+++ b/src/external/openal_soft/include/AL/efx.h
diff --git a/external/openal_soft/lib/win32/libOpenAL32.dll.a b/src/external/openal_soft/lib/win32/libOpenAL32.dll.a
index 1c4c63c8..1c4c63c8 100644
--- a/external/openal_soft/lib/win32/libOpenAL32.dll.a
+++ b/src/external/openal_soft/lib/win32/libOpenAL32.dll.a
diff --git a/src/stb_image.h b/src/external/stb_image.h
index ce87646d..ce87646d 100644
--- a/src/stb_image.h
+++ b/src/external/stb_image.h
diff --git a/src/stb_image_resize.h b/src/external/stb_image_resize.h
index 4cabe540..4cabe540 100644
--- a/src/stb_image_resize.h
+++ b/src/external/stb_image_resize.h
diff --git a/src/stb_image_write.h b/src/external/stb_image_write.h
index 4319c0de..4319c0de 100644
--- a/src/stb_image_write.h
+++ b/src/external/stb_image_write.h
diff --git a/src/stb_rect_pack.h b/src/external/stb_rect_pack.h
index bd1cfc60..bd1cfc60 100644
--- a/src/stb_rect_pack.h
+++ b/src/external/stb_rect_pack.h
diff --git a/src/stb_truetype.h b/src/external/stb_truetype.h
index d360d609..d360d609 100644
--- a/src/stb_truetype.h
+++ b/src/external/stb_truetype.h
diff --git a/src/stb_vorbis.c b/src/external/stb_vorbis.c
index 07d79318..07d79318 100644
--- a/src/stb_vorbis.c
+++ b/src/external/stb_vorbis.c
diff --git a/src/stb_vorbis.h b/src/external/stb_vorbis.h
index 624ce4bc..624ce4bc 100644
--- a/src/stb_vorbis.h
+++ b/src/external/stb_vorbis.h
diff --git a/src/tinfl.c b/src/external/tinfl.c
index a17a156b..a17a156b 100644
--- a/src/tinfl.c
+++ b/src/external/tinfl.c
diff --git a/src/libraylib.bc b/src/libraylib.bc
index 21039250..0b385eb8 100644
--- a/src/libraylib.bc
+++ b/src/libraylib.bc
diff --git a/src/rlgl.c b/src/rlgl.c
index 756fba75..9a102c01 100644
--- a/src/rlgl.c
+++ b/src/rlgl.c
@@ -48,7 +48,7 @@
     #ifdef __APPLE__ 
         #include <OpenGL/gl3.h>     // OpenGL 3 library for OSX
     #else
-        #include "glad.h"           // GLAD library, includes OpenGL headers
+        #include "external/glad.h"  // GLAD library, includes OpenGL headers
     #endif
 #endif
 
diff --git a/src/text.c b/src/text.c
index cef0ebcb..b5f7ad0c 100644
--- a/src/text.c
+++ b/src/text.c
@@ -34,7 +34,7 @@
 
 // Following libs are used on LoadTTF()
 #define STB_TRUETYPE_IMPLEMENTATION
-#include "stb_truetype.h"   // Required for: stbtt_BakeFontBitmap()
+#include "external/stb_truetype.h"   // Required for: stbtt_BakeFontBitmap()
 
 // Rectangle packing functions (not used at the moment)
 //#define STB_RECT_PACK_IMPLEMENTATION
diff --git a/src/textures.c b/src/textures.c
index 432d3426..518348f4 100644
--- a/src/textures.c
+++ b/src/textures.c
@@ -40,12 +40,12 @@
                                 // NOTE: Includes Android fopen function map
 
 #define STB_IMAGE_IMPLEMENTATION
-#include "stb_image.h"          // Required for: stbi_load()
+#include "external/stb_image.h" // Required for: stbi_load()
                                 // NOTE: Used to read image data (multiple formats support)
 
 #define STB_IMAGE_RESIZE_IMPLEMENTATION
-#include "stb_image_resize.h"   // Required for: stbir_resize_uint8() 
-                                // NOTE: Used for image scaling on ImageResize()
+#include "external/stb_image_resize.h"  // Required for: stbir_resize_uint8() 
+                                        // NOTE: Used for image scaling on ImageResize()
 
 //----------------------------------------------------------------------------------
 // Defines and Macros
diff --git a/src/utils.c b/src/utils.c
index 97561ee6..5340b3e5 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -42,10 +42,11 @@
 
 #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_RPI)
     #define STB_IMAGE_WRITE_IMPLEMENTATION
-    #include "stb_image_write.h"    // Required for: stbi_write_png()
+    #include "external/stb_image_write.h"    // Required for: stbi_write_png()
 #endif
 
-#include "tinfl.c"
+#include "external/tinfl.c"         // Required for: tinfl_decompress_mem_to_mem()
+                                    // NOTE: Deflate algorythm data decompression
 
 //----------------------------------------------------------------------------------
 // Global Variables Definition