From db2ad9648d7fa2c9b378f2dcbfaa8be372f7e957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Lech=C3=B3n?= Date: Sun, 9 Nov 2014 12:07:03 +0100 Subject: Small fixes to support a Debian/GNU Linux distro. Hopefully Ubuntu too. --- src/makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/makefile') diff --git a/src/makefile b/src/makefile index 69e7862b..c5688a49 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_LINUX_DESKTOP 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_LINUX_DESKTOP) + find . -type f -executable -delete + rm -f *.o libraylib.a else del *.o libraylib.a +endif endif @echo Cleaning done -- cgit v1.2.3 From a471b6197aec1911cf26bcc891767bca22cb9dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Lech=C3=B3n?= Date: Sun, 9 Nov 2014 13:18:32 +0100 Subject: Renamed the PLATFORM_LINUX_DESKTOP into PLATFORM_DESKTOP_LINUX. --- src/makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/makefile') diff --git a/src/makefile b/src/makefile index c5688a49..0c078e86 100644 --- a/src/makefile +++ b/src/makefile @@ -24,7 +24,7 @@ #************************************************************************************************** # define raylib platform (by default, compile for RPI) -# Other possible platforms: PLATFORM_DESKTOP PLATFORM_LINUX_DESKTOP +# Other possible platforms: PLATFORM_DESKTOP PLATFORM_DESKTOP_LINUX PLATFORM ?= PLATFORM_RPI # define raylib graphics api depending on selected platform @@ -120,7 +120,7 @@ clean: ifeq ($(PLATFORM),PLATFORM_RPI) rm -f *.o libraylib.a else -ifeq ($(PLATFORM),PLATFORM_LINUX_DESKTOP) +ifeq ($(PLATFORM),PLATFORM_DESKTOP_LINUX) find . -type f -executable -delete rm -f *.o libraylib.a else -- cgit v1.2.3 From 7375d0460a8aaeadedf85c7d6313e2cc7d8ba9e9 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 23 Nov 2014 21:58:17 +0100 Subject: Updated stb headers --- src/makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/makefile') diff --git a/src/makefile b/src/makefile index 0c078e86..bb37748a 100644 --- a/src/makefile +++ b/src/makefile @@ -49,7 +49,7 @@ CC = gcc ifeq ($(PLATFORM),PLATFORM_RPI) CFLAGS = -O2 -Wall -std=gnu99 -fgnu89-inline else - CFLAGS = -O2 -Wall -std=c99 + CFLAGS = -O2 -Wall -std=c99 -fgnu89-inline endif #CFLAGSEXTRA = -Wextra -Wmissing-prototypes -Wstrict-prototypes @@ -61,7 +61,7 @@ else endif # define all object files required -OBJS = core.o rlgl.o raymath.o shapes.o text.o textures.o models.o audio.o utils.o stb_image.o stb_vorbis.o +OBJS = core.o rlgl.o raymath.o shapes.o text.o textures.o models.o audio.o utils.o stb_vorbis.o # typing 'make' will invoke the first target entry in the file, # in this case, the 'default' target entry is raylib @@ -107,10 +107,6 @@ audio.o: audio.c utils.o: utils.c $(CC) -c utils.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -# compile stb_image library -stb_image.o: stb_image.c - $(CC) -c stb_image.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) - # compile stb_vorbis library stb_vorbis.o: stb_vorbis.c $(CC) -c stb_vorbis.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -- cgit v1.2.3