diff --git a/examples/makefile b/examples/makefile index 572bfd985..076c95947 100644 --- a/examples/makefile +++ b/examples/makefile @@ -24,7 +24,7 @@ #************************************************************************************************** # define raylib platform (by default, compile for RPI) -# Other possible platform: PLATFORM_DESKTOP +# Other possible platforms: PLATFORM_DESKTOP PLATFORM_DESKTOP_LINUX PLATFORM ?= PLATFORM_RPI # define compiler: gcc for C program, define as g++ for C++ @@ -49,7 +49,11 @@ else endif # define library paths containing required libs -LFLAGS = -L. -L../src -L/opt/vc/lib +ifeq ($(PLATFORM),PLATFORM_DESKTOP_LINUX) + LFLAGS = -L. -L../src +else + LFLAGS = -L. -L../src -L/opt/vc/lib +endif # define any libraries to link into executable # if you want to link libraries (libname.so or libname.a), use the -lname @@ -57,11 +61,18 @@ ifeq ($(PLATFORM),PLATFORM_RPI) # libraries for Raspberry Pi compiling # NOTE: OpenAL Soft library should be installed (libopenal1 package) LIBS = -lraylib -lGLESv2 -lEGL -lpthread -lrt -lm -lbcm_host -lopenal +else +ifeq ($(PLATFORM),PLATFORM_DESKTOP_LINUX) + # libraries for Debian GNU/Linux desktop compiling + # requires the following packages: + # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev + LIBS = -lraylib -lglfw -lGLEW -lGL -lopenal else # libraries for Windows desktop compiling # NOTE: GLFW3 and OpenAL Soft libraries should be installed LIBS = -lraylib -lglfw3 -lglew32 -lopengl32 -lopenal32 -lgdi32 endif +endif # define additional parameters and flags for windows ifeq ($(PLATFORM),PLATFORM_DESKTOP) @@ -238,8 +249,13 @@ clean: ifeq ($(PLATFORM),PLATFORM_RPI) rm -f *.o # find . -executable -delete +else +ifeq ($(PLATFORM),PLATFORM_DESKTOP_LINUX) + find . -type f -executable -delete + rm -f *.o else del *.o *.exe +endif endif @echo Cleaning done diff --git a/src/makefile b/src/makefile index 69e7862b0..0c078e865 100644 --- a/src/makefile +++ b/src/makefile @@ -24,7 +24,7 @@ #************************************************************************************************** # define raylib platform (by default, compile for RPI) -# Other possible platform: PLATFORM_DESKTOP +# Other possible platforms: PLATFORM_DESKTOP PLATFORM_DESKTOP_LINUX PLATFORM ?= PLATFORM_RPI # define raylib graphics api depending on selected platform @@ -119,8 +119,13 @@ stb_vorbis.o: stb_vorbis.c clean: ifeq ($(PLATFORM),PLATFORM_RPI) rm -f *.o libraylib.a +else +ifeq ($(PLATFORM),PLATFORM_DESKTOP_LINUX) + find . -type f -executable -delete + rm -f *.o libraylib.a else del *.o libraylib.a +endif endif @echo Cleaning done diff --git a/src/stb_vorbis.c b/src/stb_vorbis.c index a88b2a777..7a45725b6 100644 --- a/src/stb_vorbis.c +++ b/src/stb_vorbis.c @@ -28,6 +28,9 @@ #include "stb_vorbis.h" +#ifdef __linux +#include +#endif #ifndef STB_VORBIS_HEADER_ONLY