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.
This commit is contained in:
parent
688045307a
commit
29d505c98e
BIN
external/glfw3/glfw3.dll
vendored
BIN
external/glfw3/glfw3.dll
vendored
Binary file not shown.
BIN
external/openal_soft/openal32.dll
vendored
BIN
external/openal_soft/openal32.dll
vendored
Binary file not shown.
30
src/Makefile
30
src/Makefile
@ -81,14 +81,14 @@ CFLAGS = -O1 -Wall -std=gnu99 -fgnu89-inline -Wno-missing-braces
|
|||||||
|
|
||||||
# define any directories containing required header files
|
# define any directories containing required header files
|
||||||
ifeq ($(PLATFORM),PLATFORM_RPI)
|
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
|
else
|
||||||
INCLUDES = -I. -I../src
|
# STB libraries and others
|
||||||
# external libraries headers
|
INCLUDES = -I. -Iexternal
|
||||||
# GLFW3
|
# GLFW3 library
|
||||||
INCLUDES += -I../external/glfw3/include
|
INCLUDES += -Iexternal/glfw3/include
|
||||||
# OpenAL Soft
|
# OpenAL Soft library
|
||||||
INCLUDES += -I../external/openal_soft/include
|
INCLUDES += -Iexternal/openal_soft/include
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# define all object files required
|
# define all object files required
|
||||||
@ -121,10 +121,6 @@ core.o: core.c
|
|||||||
rlgl.o: rlgl.c
|
rlgl.o: rlgl.c
|
||||||
$(CC) -c rlgl.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS)
|
$(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
|
# compile shapes module
|
||||||
shapes.o: shapes.c
|
shapes.o: shapes.c
|
||||||
$(CC) -c shapes.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS)
|
$(CC) -c shapes.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS)
|
||||||
@ -145,10 +141,6 @@ models.o: models.c
|
|||||||
audio.o: audio.c
|
audio.o: audio.c
|
||||||
$(CC) -c audio.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
|
$(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
|
# compile utils module
|
||||||
utils.o: utils.c
|
utils.o: utils.c
|
||||||
$(CC) -c utils.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
|
$(CC) -c utils.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
|
||||||
@ -161,6 +153,14 @@ camera.o: camera.c
|
|||||||
gestures.o: gestures.c
|
gestures.o: gestures.c
|
||||||
$(CC) -c gestures.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
|
$(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 everything
|
||||||
clean:
|
clean:
|
||||||
ifeq ($(PLATFORM),PLATFORM_DESKTOP)
|
ifeq ($(PLATFORM),PLATFORM_DESKTOP)
|
||||||
|
@ -51,13 +51,13 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
//#define STB_VORBIS_HEADER_ONLY
|
//#define STB_VORBIS_HEADER_ONLY
|
||||||
#include "stb_vorbis.h" // OGG loading functions
|
#include "external/stb_vorbis.h" // OGG loading functions
|
||||||
|
|
||||||
#define JAR_XM_IMPLEMENTATION
|
#define JAR_XM_IMPLEMENTATION
|
||||||
#include "jar_xm.h" // XM loading functions
|
#include "external/jar_xm.h" // XM loading functions
|
||||||
|
|
||||||
#define JAR_MOD_IMPLEMENTATION
|
#define JAR_MOD_IMPLEMENTATION
|
||||||
#include "jar_mod.h" // MOD loading functions
|
#include "external/jar_mod.h" // MOD loading functions
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------
|
||||||
// Defines and Macros
|
// Defines and Macros
|
||||||
|
@ -55,11 +55,11 @@
|
|||||||
#include <errno.h> // Macros for reporting and retrieving error conditions through error codes
|
#include <errno.h> // Macros for reporting and retrieving error conditions through error codes
|
||||||
|
|
||||||
#if defined(PLATFORM_OCULUS)
|
#if defined(PLATFORM_OCULUS)
|
||||||
#define PLATFORM_DESKTOP // Enable PLATFORM_DESKTOP code-base
|
#define PLATFORM_DESKTOP // Enable PLATFORM_DESKTOP code-base
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(PLATFORM_DESKTOP)
|
#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
|
#endif
|
||||||
|
|
||||||
#if defined(PLATFORM_OCULUS)
|
#if defined(PLATFORM_OCULUS)
|
||||||
|
0
src/glad.c → src/external/glad.c
vendored
0
src/glad.c → src/external/glad.c
vendored
0
src/glad.h → src/external/glad.h
vendored
0
src/glad.h → src/external/glad.h
vendored
0
src/jar_mod.h → src/external/jar_mod.h
vendored
0
src/jar_mod.h → src/external/jar_mod.h
vendored
0
src/jar_xm.h → src/external/jar_xm.h
vendored
0
src/jar_xm.h → src/external/jar_xm.h
vendored
0
src/tinfl.c → src/external/tinfl.c
vendored
0
src/tinfl.c → src/external/tinfl.c
vendored
BIN
src/libraylib.bc
BIN
src/libraylib.bc
Binary file not shown.
@ -48,7 +48,7 @@
|
|||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
#include <OpenGL/gl3.h> // OpenGL 3 library for OSX
|
#include <OpenGL/gl3.h> // OpenGL 3 library for OSX
|
||||||
#else
|
#else
|
||||||
#include "glad.h" // GLAD library, includes OpenGL headers
|
#include "external/glad.h" // GLAD library, includes OpenGL headers
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
|
|
||||||
// Following libs are used on LoadTTF()
|
// Following libs are used on LoadTTF()
|
||||||
#define STB_TRUETYPE_IMPLEMENTATION
|
#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)
|
// Rectangle packing functions (not used at the moment)
|
||||||
//#define STB_RECT_PACK_IMPLEMENTATION
|
//#define STB_RECT_PACK_IMPLEMENTATION
|
||||||
|
@ -40,12 +40,12 @@
|
|||||||
// NOTE: Includes Android fopen function map
|
// NOTE: Includes Android fopen function map
|
||||||
|
|
||||||
#define STB_IMAGE_IMPLEMENTATION
|
#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)
|
// NOTE: Used to read image data (multiple formats support)
|
||||||
|
|
||||||
#define STB_IMAGE_RESIZE_IMPLEMENTATION
|
#define STB_IMAGE_RESIZE_IMPLEMENTATION
|
||||||
#include "stb_image_resize.h" // Required for: stbir_resize_uint8()
|
#include "external/stb_image_resize.h" // Required for: stbir_resize_uint8()
|
||||||
// NOTE: Used for image scaling on ImageResize()
|
// NOTE: Used for image scaling on ImageResize()
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------
|
||||||
// Defines and Macros
|
// Defines and Macros
|
||||||
|
@ -42,10 +42,11 @@
|
|||||||
|
|
||||||
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_RPI)
|
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_RPI)
|
||||||
#define STB_IMAGE_WRITE_IMPLEMENTATION
|
#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
|
#endif
|
||||||
|
|
||||||
#include "tinfl.c"
|
#include "external/tinfl.c" // Required for: tinfl_decompress_mem_to_mem()
|
||||||
|
// NOTE: Deflate algorythm data decompression
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------
|
||||||
// Global Variables Definition
|
// Global Variables Definition
|
||||||
|
Loading…
Reference in New Issue
Block a user