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 d9ac064e99ae31787e556d4f10bf3f4afd93acda (commit) from c5bd4df27278ea3eb1369beca15f5ac5ddf060f9 (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/d9ac064e99ae31787e556d4f10bf3f4afd93a... commit d9ac064e99ae31787e556d4f10bf3f4afd93acda Author: Cyril Hrubis <metan@ucw.cz> Date: Mon Nov 14 20:21:44 2011 +0100 build: Get rid of old incclude/config.h. diff --git a/configure b/configure index 13c700a..b252512 100755 --- a/configure +++ b/configure @@ -148,6 +148,9 @@ if __name__ == '__main__': l = libraries([["libpng", "Portable Network Graphics Library", [header_exists, "png.h"]], + ["libsdl", + "Simple Direct Media Layer", + [header_exists, "SDL/SDL.h"]], ["jpeg", "Library to load, handle and manipulate images in the JPEG format", [header_exists, "jpeglib.h"]]], cfg) diff --git a/demos/fbshow/Makefile b/demos/fbshow/Makefile index a3bf9c3..08f9234 100644 --- a/demos/fbshow/Makefile +++ b/demos/fbshow/Makefile @@ -4,6 +4,7 @@ CSOURCES=$(shell echo *.c) INCLUDE= CFLAGS+=-pthread +LDFLAGS+=-pthread LDLIBS+=-lGP -L$(TOPDIR)/build/ APPS=fbshow diff --git a/include/config.h b/include/config.h deleted file mode 100644 index cd640ca..0000000 --- a/include/config.h +++ /dev/null @@ -1 +0,0 @@ -#define GP_HAVE_SDL 1 diff --git a/libs/backends/GP_Backend.c b/libs/backends/GP_Backend.c index 40f3d21..f705264 100644 --- a/libs/backends/GP_Backend.c +++ b/libs/backends/GP_Backend.c @@ -25,7 +25,7 @@ #include "core/GP_Core.h" #include "GP_Backend.h" -#include "config.h" +#include "../../config.h" #include <string.h> @@ -34,7 +34,7 @@ */ static struct GP_Backend *current_backend = NULL; -#ifdef GP_HAVE_SDL +#ifdef HAVE_LIBSDL extern struct GP_Backend GP_SDL_backend; @@ -45,7 +45,7 @@ struct GP_Backend *GP_InitBackend(const char *name) if (current_backend) return current_backend; -#ifdef GP_HAVE_SDL +#ifdef HAVE_LIBSDL if (!name || strcasecmp(name, "sdl") == 0) { current_backend = GP_SDL_backend.init_fn(); diff --git a/libs/backends/GP_Backend_SDL.c b/libs/backends/GP_Backend_SDL.c index a0a40e6..3b16d00 100644 --- a/libs/backends/GP_Backend_SDL.c +++ b/libs/backends/GP_Backend_SDL.c @@ -24,9 +24,9 @@ *****************************************************************************/ #include "GP_Backend.h" -#include "config.h" +#include "../../config.h" -#ifdef GP_HAVE_SDL +#ifdef HAVE_LIBSDL #include <dlfcn.h> #include <SDL/SDL.h> @@ -160,4 +160,4 @@ struct GP_Backend GP_SDL_backend = { .get_event_fn = GP_SDL_GetEventFn, }; -#endif /* GP_HAVE_SDL */ +#endif /* HAVE_LIBSDL */ ----------------------------------------------------------------------- Summary of changes: configure | 3 +++ demos/fbshow/Makefile | 1 + include/config.h | 1 - libs/backends/GP_Backend.c | 6 +++--- libs/backends/GP_Backend_SDL.c | 6 +++--- 5 files changed, 10 insertions(+), 7 deletions(-) delete mode 100644 include/config.h 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.")