From f2f4079411472e835263a7a59ed58dba380ecca6 Mon Sep 17 00:00:00 2001 From: LelixSuper Date: Sun, 3 Apr 2016 16:05:23 +0200 Subject: Remove recipes of GLEW from Makefile (not used any more) --- src/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index cab2ced0..8aeb00d7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -84,8 +84,6 @@ else # external libraries headers # GLFW3 INCLUDES += -I../external/glfw3/include -# GLEW - INCLUDES += -I../external/glew/include # OpenAL Soft INCLUDES += -I../external/openal_soft/include endif @@ -143,7 +141,7 @@ models.o: models.c # compile audio module 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) -- cgit v1.2.3 From a04a7b6ea53ed291a742baf764bd604d9fc7b70e Mon Sep 17 00:00:00 2001 From: LelixSuper Date: Sun, 3 Apr 2016 16:07:44 +0200 Subject: Fix cleaning recipies for GNU/Linux --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 8aeb00d7..76dbfc67 100644 --- a/src/Makefile +++ b/src/Makefile @@ -165,7 +165,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) rm -f *.o libraylib.a else ifeq ($(PLATFORM_OS),LINUX) - find -type f -executable | xargs file -i | grep -E 'x-object|x-archive|x-sharedlib|x-executable' | rev | cut -d ':' -f 2- | rev | xargs rm -f + rm -f *.o libraylib.a else del *.o libraylib.a endif -- cgit v1.2.3 From 93616157862ab9557c42494e23fc96d9d4de21d1 Mon Sep 17 00:00:00 2001 From: LelixSuper Date: Wed, 6 Apr 2016 13:21:29 +0200 Subject: Fix Makefile files I've added .PHONY targets and fixed "clean" recipe. --- src/Makefile | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 76dbfc67..12f4609b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -21,6 +21,8 @@ # #************************************************************************************************** +.PHONY: all clean + # define raylib platform to compile for # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB PLATFORM ?= PLATFORM_DESKTOP @@ -97,9 +99,9 @@ else endif -# typing 'make' will invoke the first target entry in the file, -# in this case, the 'default' target entry is raylib -default: raylib +# typing 'make' will invoke the default target entry called 'all', +# in this case, the 'default' target entry is basic_game +all: raylib # compile raylib library raylib: $(OBJS) @@ -161,21 +163,21 @@ gestures.o: gestures.c # clean everything clean: ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ifeq ($(PLATFORM_OS),OSX) - rm -f *.o libraylib.a + ifeq ($(PLATFORM_OS),WINDOWS) + del *.o libraylib.a else - ifeq ($(PLATFORM_OS),LINUX) rm -f *.o libraylib.a - else - del *.o libraylib.a endif +endif +ifeq ($(PLATFORM),PLATFORM_WEB) + ifeq ($(PLATFORM_OS),WINDOWS) + del *.o libraylib.bc + else + rm -f *.o libraylib.bc endif endif ifeq ($(PLATFORM),PLATFORM_RPI) rm -f *.o libraylib.a -endif -ifeq ($(PLATFORM),PLATFORM_WEB) - del *.o libraylib.bc endif @echo Cleaning done -- cgit v1.2.3