From 3e88156817d5de5cc413acf67f0fd0a39a69acb2 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Wed, 1 Jun 2016 12:38:06 +0200 Subject: Ignore invalid warning --- src/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 12f4609b..244675e2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -69,12 +69,13 @@ else endif # define compiler flags: -# -O1 defines optimization level -# -Wall turns on most, but not all, compiler warnings -# -std=c99 defines C language mode (standard C from 1999 revision) -# -std=gnu99 defines C language mode (GNU C from 1999 revision) -# -fgnu89-inline declaring inline functions support (GCC optimized, faster) -CFLAGS = -O1 -Wall -std=gnu99 -fgnu89-inline +# -O1 defines optimization level +# -Wall turns on most, but not all, compiler warnings +# -std=c99 defines C language mode (standard C from 1999 revision) +# -std=gnu99 defines C language mode (GNU C from 1999 revision) +# -fgnu89-inline declaring inline functions support (GCC optimized, faster) +# -Wno-missing-braces ignore invalid warning (GCC bug 53119) +CFLAGS = -O1 -Wall -std=gnu99 -fgnu89-inline -Wno-missing-braces #CFLAGSEXTRA = -Wextra -Wmissing-prototypes -Wstrict-prototypes -- cgit v1.2.3 From 29d505c98e6b24882927347cf24f5736d5f8c849 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 6 Jun 2016 14:34:43 +0200 Subject: 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. --- src/Makefile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 244675e2..7f15bd2f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -81,14 +81,14 @@ CFLAGS = -O1 -Wall -std=gnu99 -fgnu89-inline -Wno-missing-braces # define any directories containing required header files 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 - INCLUDES = -I. -I../src -# external libraries headers -# GLFW3 - INCLUDES += -I../external/glfw3/include -# OpenAL Soft - INCLUDES += -I../external/openal_soft/include +# STB libraries and others + INCLUDES = -I. -Iexternal +# GLFW3 library + INCLUDES += -Iexternal/glfw3/include +# OpenAL Soft library + INCLUDES += -Iexternal/openal_soft/include endif # define all object files required @@ -121,10 +121,6 @@ core.o: core.c rlgl.o: rlgl.c $(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 shapes.o: shapes.c $(CC) -c shapes.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) -D$(GRAPHICS) @@ -145,10 +141,6 @@ models.o: models.c 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) - # compile utils module utils.o: utils.c $(CC) -c utils.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM) @@ -161,6 +153,14 @@ camera.o: camera.c gestures.o: gestures.c $(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: ifeq ($(PLATFORM),PLATFORM_DESKTOP) -- cgit v1.2.3 From 302d84cedc334087efa9395d71499118b74b2031 Mon Sep 17 00:00:00 2001 From: LelixSuper Date: Mon, 6 Jun 2016 19:26:30 +0200 Subject: Fix mistake in Makefile --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 7f15bd2f..92e37cfb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -101,7 +101,7 @@ endif # typing 'make' will invoke the default target entry called 'all', -# in this case, the 'default' target entry is basic_game +# in this case, the 'default' target entry is raylib all: raylib # compile raylib library -- cgit v1.2.3 From 058af472ea68d0e18e46a44bd0bd44445aa4587b Mon Sep 17 00:00:00 2001 From: raysan5 Date: Tue, 7 Jun 2016 18:57:20 +0200 Subject: Converted GLAD to header only --- src/Makefile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 92e37cfb..ce703c3a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -92,13 +92,7 @@ else endif # define all object files required -ifeq ($(PLATFORM),PLATFORM_DESKTOP) - OBJS = core.o rlgl.o glad.o shapes.o text.o textures.o models.o audio.o utils.o camera.o gestures.o stb_vorbis.o -else - #GLAD only required on desktop platform - OBJS = core.o rlgl.o shapes.o text.o textures.o models.o audio.o stb_vorbis.o utils.o camera.o gestures.o -endif - +OBJS = core.o rlgl.o shapes.o text.o textures.o models.o audio.o utils.o camera.o gestures.o stb_vorbis.o # typing 'make' will invoke the default target entry called 'all', # in this case, the 'default' target entry is raylib @@ -153,10 +147,6 @@ camera.o: camera.c gestures.o: gestures.c $(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) -- cgit v1.2.3