This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 18ebb6623592780a57e7eea4f2e646c9a4c8dd99 (commit) via 335644c07618c8cd0a56559c47be572e896c0356 (commit) via 127badb9b2c793efcf9e67f9cf2e7ac940fdf5aa (commit) via f4a0bc10531fb0f7ab0330bc0f9b71cb84231bcb (commit) from f945311372cbe2b60435593398c7de612c492c75 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/18ebb6623592780a57e7eea4f2e646c9a4c8d... commit 18ebb6623592780a57e7eea4f2e646c9a4c8dd99 Author: Cyril Hrubis <metan@ucw.cz> Date: Wed Jul 25 23:13:10 2012 +0200 build: Remove unused -ldl. diff --git a/app.mk b/app.mk index c743505..556f9fd 100644 --- a/app.mk +++ b/app.mk @@ -1,4 +1,4 @@ -LDLIBS+=-lm -ldl +LDLIBS+=-lm ALL+=$(APPS) CLEAN+=$(APPS) http://repo.or.cz/w/gfxprim.git/commit/335644c07618c8cd0a56559c47be572e896c0... commit 335644c07618c8cd0a56559c47be572e896c0356 Author: Cyril Hrubis <metan@ucw.cz> Date: Wed Jul 25 22:49:13 2012 +0200 demos: Fix demos LDLIBS and LDFLAGS. diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index 68cf89e..0a311ea 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -3,7 +3,8 @@ TOPDIR=../.. CSOURCES=$(shell echo *.c) INCLUDE= -LDLIBS+=-lGP -lGP_backends -lSDL -L$(TOPDIR)/build/ +LDFLAGS+=-L$(TOPDIR)/build/ +LDLIBS+=-lrt `$(TOPDIR)/gfxprim-config --libs --libs-backends` APPS=backend_example loaders_example loaders filters_symmetry gfx_koch virtual_backend_example meta_data meta_data_dump tmp_file showimagediff --git a/demos/grinder/Makefile b/demos/grinder/Makefile index 56117e6..2ea815c 100644 --- a/demos/grinder/Makefile +++ b/demos/grinder/Makefile @@ -2,8 +2,9 @@ TOPDIR=../.. CSOURCES=$(shell echo *.c) -INCLUDE=core gfx SDL -LDLIBS+=-lGP -L$(TOPDIR)/build/ +INCLUDE=core gfx +LDFLAGS+=-L$(TOPDIR)/build/ +LDLIBS+=-lrt `$(TOPDIR)/gfxprim-config --libs --libs-backends` APPS=grinder diff --git a/demos/particle/Makefile b/demos/particle/Makefile index 17cd059..6204f93 100644 --- a/demos/particle/Makefile +++ b/demos/particle/Makefile @@ -3,7 +3,8 @@ TOPDIR=../.. CSOURCES=$(shell echo *.c) INCLUDE= -LDLIBS+=-lGP -lGP_backends -lSDL -L$(TOPDIR)/build/ +LDFLAGS+=-L$(TOPDIR)/build/ +LDLIBS+=-lrt `$(TOPDIR)/gfxprim-config --libs --libs-backends` APPS=particle_demo diff --git a/demos/spiv/Makefile b/demos/spiv/Makefile index 431e6ce..f533179 100644 --- a/demos/spiv/Makefile +++ b/demos/spiv/Makefile @@ -3,9 +3,8 @@ TOPDIR=../.. CSOURCES=$(shell echo *.c) INCLUDE= -CFLAGS+=-pthread -LDFLAGS+=-pthread -lrt -LDLIBS+=-lGP -lGP_backends -lSDL -L$(TOPDIR)/build/ +LDFLAGS+=-L$(TOPDIR)/build/ +LDLIBS+=-lrt `$(TOPDIR)/gfxprim-config --libs --libs-backends` APPS=spiv http://repo.or.cz/w/gfxprim.git/commit/127badb9b2c793efcf9e67f9cf2e7ac940fdf... commit 127badb9b2c793efcf9e67f9cf2e7ac940fdf5aa Author: Cyril Hrubis <metan@ucw.cz> Date: Wed Jul 25 22:38:11 2012 +0200 input: Fix Xlib less build. diff --git a/libs/input/GP_InputDriverX11.c b/libs/input/GP_InputDriverX11.c index bab3b2a..3de0734 100644 --- a/libs/input/GP_InputDriverX11.c +++ b/libs/input/GP_InputDriverX11.c @@ -24,10 +24,11 @@ #include "core/GP_Debug.h" #include "GP_Event.h" -#include "GP_InputDriverX11.h" #ifdef HAVE_LIBX11 +#include "GP_InputDriverX11.h" + /* X11 keycodes */ static uint16_t keycode_table[] = { GP_KEY_ESC, GP_KEY_1, GP_KEY_2, GP_KEY_3, http://repo.or.cz/w/gfxprim.git/commit/f4a0bc10531fb0f7ab0330bc0f9b71cb84231... commit f4a0bc10531fb0f7ab0330bc0f9b71cb84231bcb Author: Cyril Hrubis <metan@ucw.cz> Date: Wed Jul 25 22:32:31 2012 +0200 text: Fix FreeType less build. diff --git a/libs/text/GP_FreeType.c b/libs/text/GP_FreeType.c index b454d89..29b3977 100644 --- a/libs/text/GP_FreeType.c +++ b/libs/text/GP_FreeType.c @@ -20,12 +20,15 @@ * * *****************************************************************************/ +#include "../../config.h" +#include "core/GP_Debug.h" +#include "text/GP_Font.h" + +#ifdef HAVE_FREETYPE + #include <ft2build.h> #include FT_FREETYPE_H -#include "core/GP_Debug.h" -#include "GP_Font.h" - GP_FontFace *GP_FontFaceLoad(const char *path, uint32_t width, uint32_t height) { FT_Library library; @@ -199,3 +202,18 @@ err1: //TODO FREETYPE CLEANUP return NULL; } + +#else + +GP_FontFace *GP_FontFaceLoad(const char *path, uint32_t width, uint32_t height) +{ + (void)path; + (void)width; + (void)height; + + GP_WARN("FreeType support not compiled in."); + + return NULL; +} + +#endif /* HAVE_FREETYPE */ diff --git a/libs/text/Makefile b/libs/text/Makefile index 48c746f..ed33ab7 100644 --- a/libs/text/Makefile +++ b/libs/text/Makefile @@ -1,12 +1,16 @@ TOPDIR=../.. +include $(TOPDIR)/pre.mk +include $(TOPDIR)/config.mk + GENSOURCES=GP_Text.gen.c CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) LIBNAME=text -include $(TOPDIR)/pre.mk include $(TOPDIR)/gen.mk include $(TOPDIR)/lib.mk include $(TOPDIR)/post.mk +ifeq ($(HAVE_FREETYPE),yes) GP_FreeType.dep: CFLAGS+=`freetype-config --cflags` GP_FreeType.o: CFLAGS+=`freetype-config --cflags` +endif ----------------------------------------------------------------------- Summary of changes: app.mk | 2 +- demos/c_simple/Makefile | 3 ++- demos/grinder/Makefile | 5 +++-- demos/particle/Makefile | 3 ++- demos/spiv/Makefile | 5 ++--- libs/input/GP_InputDriverX11.c | 3 ++- libs/text/GP_FreeType.c | 24 +++++++++++++++++++++--- libs/text/Makefile | 6 +++++- 8 files changed, 38 insertions(+), 13 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")