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 db5988548d394fcf94da3d66ff85c40afd719fc1 (commit) from 665128da4ce856b78beece7af486c561a0a84f58 (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/db5988548d394fcf94da3d66ff85c40afd719... commit db5988548d394fcf94da3d66ff85c40afd719fc1 Author: Cyril Hrubis <metan@ucw.cz> Date: Mon May 23 22:45:07 2011 +0200 build: Hacked together the deprecated SDL backend and it's tests. diff --git a/build/Makefile b/build/Makefile index 642e852..6f01215 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,13 +1,13 @@ LIB_OBJECTS=$(shell ./get_objs.sh) -all: libGP.a libGP.so +all: libGP.a libGP.so libGP.so.0 clean: ifdef VERBOSE - rm -f libGP.a libGP.so + rm -f libGP.a libGP.so libGP.so.0 else - @echo "RM libGP.a libGP.so" - @rm -f libGP.a libGP.so + @echo "RM libGP.a libGP.so libGP.so.0" + @rm -f libGP.a libGP.so libGP.so.0 endif libGP.a: $(LIB_OBJECTS) @@ -29,3 +29,11 @@ else @$(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,libGP.so.0 $(LIB_OBJECTS) -o libGP.so endif @. ./liblock.sh; spinunlock . + +libGP.so.0: libGP.so +ifdef VERBOSE + ln -s libGP.so libGP.so.0 +else + @echo "LN libGP.so.0" + @ln -s libGP.so libGP.so.0 +endif diff --git a/include/GP.h b/include/GP.h index e68b747..90777f3 100644 --- a/include/GP.h +++ b/include/GP.h @@ -35,4 +35,7 @@ /* fonts and text drawing */ #include "text/GP_Text.h" +/* backends */ +#include "backends/GP_Backend.h" + #endif /* GP_H */ diff --git a/include/backends/GP_Backend.h b/include/backends/GP_Backend.h index 3f81ed7..db771cd 100644 --- a/include/backends/GP_Backend.h +++ b/include/backends/GP_Backend.h @@ -89,4 +89,4 @@ void GP_UpdateBackendVideo(void); */ int GP_GetBackendEvent(struct GP_BackendEvent *event); -#endif +#endif /* GP_BACKEND_H */ diff --git a/tests/sdl/GP_SDL.h b/include/sdl/GP_SDL.h similarity index 100% rename from tests/sdl/GP_SDL.h rename to include/sdl/GP_SDL.h diff --git a/tests/sdl/GP_SDL_Context.h b/include/sdl/GP_SDL_Context.h similarity index 95% rename from tests/sdl/GP_SDL_Context.h rename to include/sdl/GP_SDL_Context.h index c908b51..3963824 100644 --- a/tests/sdl/GP_SDL_Context.h +++ b/include/sdl/GP_SDL_Context.h @@ -28,7 +28,6 @@ #include "GP.h" -inline GP_RetCode GP_SDL_ContextFromSurface(GP_Context *context, - SDL_Surface *surf); +GP_RetCode GP_SDL_ContextFromSurface(GP_Context *context, SDL_Surface *surf); #endif /* GP_SDL_CONTEXT_H */ diff --git a/tests/sdl/GP_SDL_VideoInit.h b/include/sdl/GP_SDL_VideoInit.h similarity index 100% rename from tests/sdl/GP_SDL_VideoInit.h rename to include/sdl/GP_SDL_VideoInit.h diff --git a/include/sdl/README b/include/sdl/README new file mode 100644 index 0000000..37680b8 --- /dev/null +++ b/include/sdl/README @@ -0,0 +1,2 @@ +This code/interface is deprecated and will be removed after backends are +written. diff --git a/libs/Makefile b/libs/Makefile index 1c3d990..9907fb1 100644 --- a/libs/Makefile +++ b/libs/Makefile @@ -1,3 +1,3 @@ TOPDIR=.. -SUBDIRS=core gfx text loaders filters input backends +SUBDIRS=core gfx text loaders filters input backends sdl include $(TOPDIR)/include.mk diff --git a/libs/gfx/GP_Circle.c b/libs/gfx/GP_Circle.c index 9522c1b..4e92243 100644 --- a/libs/gfx/GP_Circle.c +++ b/libs/gfx/GP_Circle.c @@ -45,6 +45,16 @@ void GP_Circle(GP_Context *context, int xcenter, int ycenter, xcenter, ycenter, r, pixel); } +void GP_TCircle(GP_Context *context, int xcenter, int ycenter, + unsigned int r, GP_Pixel pixel) +{ + GP_CHECK_CONTEXT(context); + + GP_TRANSFORM_POINT(context, xcenter, ycenter); + + GP_Circle(context, xcenter, ycenter, r, pixel); +} + #include "algo/FillCircle.algo.h" /* Generate drawing functions for various bit depths. */ diff --git a/tests/sdl/GP_SDL_Context.c b/libs/sdl/GP_SDL_Context.c similarity index 98% rename from tests/sdl/GP_SDL_Context.c rename to libs/sdl/GP_SDL_Context.c index 3689e44..487476b 100644 --- a/tests/sdl/GP_SDL_Context.c +++ b/libs/sdl/GP_SDL_Context.c @@ -97,8 +97,7 @@ static enum GP_PixelType find_surface_pixel_type(SDL_Surface *surf) } -inline GP_RetCode GP_SDL_ContextFromSurface( - GP_Context *context, SDL_Surface *surf) +GP_RetCode GP_SDL_ContextFromSurface(GP_Context *context, SDL_Surface *surf) { if (surf == NULL || surf->pixels == NULL || context == NULL) { return GP_ENULLPTR; diff --git a/tests/sdl/GP_SDL_VideoInit.c b/libs/sdl/GP_SDL_VideoInit.c similarity index 100% rename from tests/sdl/GP_SDL_VideoInit.c rename to libs/sdl/GP_SDL_VideoInit.c diff --git a/libs/sdl/Makefile b/libs/sdl/Makefile new file mode 100644 index 0000000..ede8ef8 --- /dev/null +++ b/libs/sdl/Makefile @@ -0,0 +1,5 @@ +TOPDIR=../.. +CSOURCES=$(shell ls *.c) +LIBNAME=sdl +include $(TOPDIR)/include.mk +include $(TOPDIR)/lib.mk diff --git a/tests/Makefile b/tests/Makefile index 1008e61..4181c5c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,3 +1,3 @@ TOPDIR=.. -SUBDIRS=loaders filters core +SUBDIRS=loaders filters core sdl include $(TOPDIR)/include.mk diff --git a/tests/sdl/Makefile b/tests/sdl/Makefile index e7c006f..41b109f 100644 --- a/tests/sdl/Makefile +++ b/tests/sdl/Makefile @@ -1,2 +1,16 @@ -all: -clean: +TOPDIR=../.. + +CSOURCES=$(shell echo *.c) + +INCLUDE=core gfx sdl backends +LDLIBS+=-lGP -L$(TOPDIR)/build/ -lSDL + +APPS=pixeltest fileview fonttest linetest randomshapetest shapetest sierpinsky+ symboltest textaligntest trianglefps + +include $(TOPDIR)/include.mk +include $(TOPDIR)/app.mk + + +$(APPS): $(TOPDIR)/libs/sdl/*.o + diff --git a/tests/sdl/tests/fileview.c b/tests/sdl/fileview.c similarity index 100% rename from tests/sdl/tests/fileview.c rename to tests/sdl/fileview.c diff --git a/tests/sdl/tests/fonttest.c b/tests/sdl/fonttest.c similarity index 100% rename from tests/sdl/tests/fonttest.c rename to tests/sdl/fonttest.c diff --git a/tests/sdl/tests/linetest.c b/tests/sdl/linetest.c similarity index 100% rename from tests/sdl/tests/linetest.c rename to tests/sdl/linetest.c diff --git a/tests/sdl/tests/Makefile b/tests/sdl/old.dddd similarity index 100% rename from tests/sdl/tests/Makefile rename to tests/sdl/old.dddd diff --git a/tests/sdl/tests/pixeltest.c b/tests/sdl/pixeltest.c similarity index 100% rename from tests/sdl/tests/pixeltest.c rename to tests/sdl/pixeltest.c diff --git a/tests/sdl/tests/randomshapetest.c b/tests/sdl/randomshapetest.c similarity index 100% rename from tests/sdl/tests/randomshapetest.c rename to tests/sdl/randomshapetest.c diff --git a/tests/sdl/runtest.sh b/tests/sdl/runtest.sh new file mode 100755 index 0000000..73c9f61 --- /dev/null +++ b/tests/sdl/runtest.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +# Run dynamically linked test. +# + +PROG="$1" +shift + +echo "LD_LIBRARY_PATH=../../build/ ./$PROG $@" +LD_LIBRARY_PATH=../../build/ ./$PROG $@ diff --git a/tests/sdl/tests/shapetest.c b/tests/sdl/shapetest.c similarity index 100% rename from tests/sdl/tests/shapetest.c rename to tests/sdl/shapetest.c diff --git a/tests/sdl/tests/sierpinsky.c b/tests/sdl/sierpinsky.c similarity index 100% rename from tests/sdl/tests/sierpinsky.c rename to tests/sdl/sierpinsky.c diff --git a/tests/sdl/tests/symbolstest.c b/tests/sdl/symbolstest.c similarity index 100% rename from tests/sdl/tests/symbolstest.c rename to tests/sdl/symbolstest.c diff --git a/tests/sdl/tests/runtest.sh b/tests/sdl/tests/runtest.sh deleted file mode 100755 index 4678f55..0000000 --- a/tests/sdl/tests/runtest.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# -# Run dynamically linked test. -# - -PROG="$1" -shift - -echo "LD_LIBRARY_PATH=..:../../.. ./$PROG $@" -LD_LIBRARY_PATH=..:../../../core ./$PROG $@ diff --git a/tests/sdl/tests/textaligntest.c b/tests/sdl/textaligntest.c similarity index 100% rename from tests/sdl/tests/textaligntest.c rename to tests/sdl/textaligntest.c diff --git a/tests/sdl/tests/trianglefps.c b/tests/sdl/trianglefps.c similarity index 100% rename from tests/sdl/tests/trianglefps.c rename to tests/sdl/trianglefps.c ----------------------------------------------------------------------- Summary of changes: build/Makefile | 16 ++++++++++++---- include/GP.h | 3 +++ include/backends/GP_Backend.h | 2 +- {tests => include}/sdl/GP_SDL.h | 0 {tests => include}/sdl/GP_SDL_Context.h | 3 +-- {tests => include}/sdl/GP_SDL_VideoInit.h | 0 include/sdl/README | 2 ++ libs/Makefile | 2 +- libs/gfx/GP_Circle.c | 10 ++++++++++ {tests => libs}/sdl/GP_SDL_Context.c | 3 +-- {tests => libs}/sdl/GP_SDL_VideoInit.c | 0 libs/{gfx => sdl}/Makefile | 2 +- tests/Makefile | 2 +- tests/sdl/Makefile | 18 ++++++++++++++++-- tests/sdl/{tests => }/fileview.c | 0 tests/sdl/{tests => }/fonttest.c | 0 tests/sdl/{tests => }/linetest.c | 0 tests/sdl/{tests/Makefile => old.dddd} | 0 tests/sdl/{tests => }/pixeltest.c | 0 tests/sdl/{tests => }/randomshapetest.c | 0 tests/sdl/runtest.sh | 10 ++++++++++ tests/sdl/{tests => }/shapetest.c | 0 tests/sdl/{tests => }/sierpinsky.c | 0 tests/sdl/{tests => }/symbolstest.c | 0 tests/sdl/tests/runtest.sh | 10 ---------- tests/sdl/{tests => }/textaligntest.c | 0 tests/sdl/{tests => }/trianglefps.c | 0 27 files changed, 59 insertions(+), 24 deletions(-) rename {tests => include}/sdl/GP_SDL.h (100%) rename {tests => include}/sdl/GP_SDL_Context.h (95%) rename {tests => include}/sdl/GP_SDL_VideoInit.h (100%) create mode 100644 include/sdl/README rename {tests => libs}/sdl/GP_SDL_Context.c (98%) rename {tests => libs}/sdl/GP_SDL_VideoInit.c (100%) copy libs/{gfx => sdl}/Makefile (88%) rename tests/sdl/{tests => }/fileview.c (100%) rename tests/sdl/{tests => }/fonttest.c (100%) rename tests/sdl/{tests => }/linetest.c (100%) rename tests/sdl/{tests/Makefile => old.dddd} (100%) rename tests/sdl/{tests => }/pixeltest.c (100%) rename tests/sdl/{tests => }/randomshapetest.c (100%) create mode 100755 tests/sdl/runtest.sh rename tests/sdl/{tests => }/shapetest.c (100%) rename tests/sdl/{tests => }/sierpinsky.c (100%) rename tests/sdl/{tests => }/symbolstest.c (100%) delete mode 100755 tests/sdl/tests/runtest.sh rename tests/sdl/{tests => }/textaligntest.c (100%) rename tests/sdl/{tests => }/trianglefps.c (100%) 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.")