From b92c1bbbf770da306059578cedc310f6d1542efb Mon Sep 17 00:00:00 2001 From: Constantine Tarasenkov Date: Sun, 25 Jan 2015 17:53:29 +0300 Subject: Fixes for makefiles, GLFW 3.1 library for Linux --- src/makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/makefile') diff --git a/src/makefile b/src/makefile index a726b92e..77aa2b5d 100644 --- a/src/makefile +++ b/src/makefile @@ -155,8 +155,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) rm -f *.o libraylib.a else ifeq ($(PLATFORM_OS),LINUX) - find . -type f -executable -delete - rm -f *.o libraylib.a + 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 else del *.o libraylib.a endif -- cgit v1.2.3 From a7714c842f72b8d41829caa7564f91abb3ffbd6b Mon Sep 17 00:00:00 2001 From: raysan5 Date: Mon, 11 May 2015 00:15:46 +0200 Subject: raymath module review and other changes Complete review of matrix rotation math Check compressed textures support WIP: LoadImageFromData() --- src/makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/makefile') diff --git a/src/makefile b/src/makefile index 77aa2b5d..1908b138 100644 --- a/src/makefile +++ b/src/makefile @@ -93,7 +93,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_vorbis.o +OBJS = core.o rlgl.o raymath.o shapes.o text.o textures.o models.o audio.o utils.o stb_vorbis.o camera.o gestures.o # typing 'make' will invoke the first target entry in the file, # in this case, the 'default' target entry is raylib @@ -148,6 +148,14 @@ utils.o: utils.c stb_vorbis.o: stb_vorbis.c $(CC) -c stb_vorbis.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) +# compile camera module +camera.o: camera.c + $(CC) -c camera.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) + +# compile gestures module +gestures.o: gestures.c + $(CC) -c gestures.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) + # clean everything clean: ifeq ($(PLATFORM),PLATFORM_DESKTOP) -- cgit v1.2.3 From e25f1227c0dfde7ba5c69237a4bbfe1277841135 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Mon, 11 May 2015 18:22:16 +0200 Subject: Updated stb headers --- src/makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/makefile') diff --git a/src/makefile b/src/makefile index 1908b138..11bbea9d 100644 --- a/src/makefile +++ b/src/makefile @@ -93,7 +93,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_vorbis.o camera.o gestures.o +OBJS = core.o rlgl.o raymath.o shapes.o text.o textures.o models.o audio.o utils.o camera.o gestures.o # typing 'make' will invoke the first target entry in the file, # in this case, the 'default' target entry is raylib @@ -144,10 +144,6 @@ audio.o: audio.c utils.o: utils.c $(CC) -c utils.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -# compile stb_vorbis library -stb_vorbis.o: stb_vorbis.c - $(CC) -c stb_vorbis.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) - # compile camera module camera.o: camera.c $(CC) -c camera.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -- cgit v1.2.3