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, pywrap has been updated via 2f2ccc529e4ea63e975e7815f0259f2ff3711deb (commit) via 56312f60da9d1cd165f522489a4c8b1821ec2820 (commit) via 90bea6f18d4e4562f63f196e9029fe2603793e83 (commit) via 89969fce89eede52612a2fa38ffa109dc66b38fb (commit) via bac5c04edb39e16dd0632b1d900daa77d350bdb1 (commit) via 7cb9b250da3dd979a43169cd7fdb47c0dbcb1437 (commit) via 5fe09088bb3606b059aab62e0decdb05e122e34f (commit) via 548b430abfdc45d7fdae3c88fc998c9431179f54 (commit) via 017a24fe557af8dfd0f3b98796ef439db5246a84 (commit) via 0a5fbacf4887f8cf496cf45c9fa7121f091f1153 (commit) via 40ef6e9a083f24ff72acc2a52e0902cb35d5a768 (commit) via c1d7712882e1eebc596ebba1dbf597deb66a105a (commit) via 95b8a1898cd06074a268d53022229875e689ed7b (commit) via 2988715637a4e169cf766abe2f777c76600180c7 (commit) via 30ca8e94204a8e1d24346bedc088197b0e877846 (commit) via 8fd80e09adcbee684f691159ea96bb852c5d17a8 (commit) via b2930cfac623e072342fd297ad3b82e28e2aba83 (commit) from 2465d9f19ff464a62ca5a8488188cf234eac2fc0 (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/2f2ccc529e4ea63e975e7815f0259f2ff3711...
commit 2f2ccc529e4ea63e975e7815f0259f2ff3711deb Author: Cyril Hrubis metan@ucw.cz Date: Sat Feb 25 15:01:56 2012 +0100
build: Update pywrap build system.
diff --git a/pylib/gfxprim/Makefile b/pylib/gfxprim/Makefile index e668b60..71ce926 100644 --- a/pylib/gfxprim/Makefile +++ b/pylib/gfxprim/Makefile @@ -1,3 +1,3 @@ TOPDIR=../.. SUBDIRS=core loaders backends gfx filters text -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/backends/Makefile b/pylib/gfxprim/backends/Makefile index 11180f9..66f7833 100644 --- a/pylib/gfxprim/backends/Makefile +++ b/pylib/gfxprim/backends/Makefile @@ -2,5 +2,7 @@ TOPDIR=../../.. LIBNAME=backends INCLUDE=core LDLIBS+=-lGP_backends -lSDL + +include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/core/Makefile b/pylib/gfxprim/core/Makefile index 312df53..5d655a8 100644 --- a/pylib/gfxprim/core/Makefile +++ b/pylib/gfxprim/core/Makefile @@ -1,4 +1,6 @@ TOPDIR=../../.. LIBNAME=core + +include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/filters/Makefile b/pylib/gfxprim/filters/Makefile index 6e03032..b1faad7 100644 --- a/pylib/gfxprim/filters/Makefile +++ b/pylib/gfxprim/filters/Makefile @@ -1,5 +1,7 @@ TOPDIR=../../.. LIBNAME=filters INCLUDE=core + +include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/gfx/Makefile b/pylib/gfxprim/gfx/Makefile index db31c60..e8ba808 100644 --- a/pylib/gfxprim/gfx/Makefile +++ b/pylib/gfxprim/gfx/Makefile @@ -1,5 +1,7 @@ TOPDIR=../../.. LIBNAME=gfx INCLUDE=core + +include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/loaders/Makefile b/pylib/gfxprim/loaders/Makefile index 196c9c1..41a94ed 100644 --- a/pylib/gfxprim/loaders/Makefile +++ b/pylib/gfxprim/loaders/Makefile @@ -1,5 +1,7 @@ TOPDIR=../../.. LIBNAME=loaders INCLUDE=core + +include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/text/Makefile b/pylib/gfxprim/text/Makefile index 9549bc3..cebfb3c 100644 --- a/pylib/gfxprim/text/Makefile +++ b/pylib/gfxprim/text/Makefile @@ -1,5 +1,7 @@ TOPDIR=../../.. LIBNAME=text INCLUDE=core + +include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk -include $(TOPDIR)/include.mk +include $(TOPDIR)/post.mk diff --git a/pywrap.mk b/pywrap.mk index b03ab6d..014393a 100644 --- a/pywrap.mk +++ b/pywrap.mk @@ -13,7 +13,7 @@ ifneq ($(SWIG),)
INCLUDES+=$(addprefix -I$(TOPDIR)/include/, $(INCLUDE))
-all: $(SWIG_LIB) $(SWIG_PY) +ALL+=$(SWIG_LIB) $(SWIG_PY)
$(SWIG_C) $(SWIG_PY): $(SWIG_SRC) ifdef VERBOSE
http://repo.or.cz/w/gfxprim.git/commit/56312f60da9d1cd165f522489a4c8b1821ec2...
commit 56312f60da9d1cd165f522489a4c8b1821ec2820 Merge: 2465d9f 90bea6f Author: Cyril Hrubis metan@ucw.cz Date: Sat Feb 25 14:55:31 2012 +0100
Merge branch 'master' into pywrap
Conflicts: pylib/Makefile
diff --cc include/core/Makefile index 7eb72be,95e7064..340958b --- a/include/core/Makefile +++ b/include/core/Makefile @@@ -1,7 -1,9 +1,9 @@@ TOPDIR=../.. GENHEADERS=GP_Convert_Scale.gen.h GP_Pixel.gen.h GP_GetPutPixel.gen.h GP_Convert.gen.h GP_FnPerBpp.gen.h - GP_MixPixels.gen.h GP_GammaCorrection.gen.h + GP_MixPixels.gen.h GP_GammaCorrection.gen.h LIBNAME=core + + include $(TOPDIR)/pre.mk include $(TOPDIR)/gen.mk - include $(TOPDIR)/include.mk + include $(TOPDIR)/post.mk
-----------------------------------------------------------------------
Summary of changes: Makefile | 6 +- app.mk | 3 +- demos/Makefile | 2 +- demos/fbshow/Makefile | 3 +- demos/fbshow/fbshow.c | 44 ++--- demos/grinder/Makefile | 3 +- demos/grinder/grinder.c | 63 +++++- demos/particle/Makefile | 3 +- demos/particle/particle_demo.c | 17 +-- demos/particle/space.c | 2 +- gen.mk | 7 +- include/GP.h | 4 +- include/Makefile | 2 +- include/backends/GP_Backend.h | 15 +- .../GP_BMP.h => backends/GP_BackendInit.h} | 48 +++--- include/backends/GP_Backends.h | 11 +- include/backends/GP_SDL.h | 5 +- include/core/Makefile | 4 +- include/input/GP_Event.h | 2 +- .../{backends/GP_Backends.h => input/GP_Input.h} | 22 +-- lib.mk | 42 ++-- libs/Makefile | 2 +- libs/SDL/Makefile | 4 +- .../GP_Backends.h => libs/backends/GP_Backend.c | 33 ++-- libs/backends/GP_BackendInit.c | 216 ++++++++++++++++++++ libs/backends/GP_SDL.c | 23 ++- libs/backends/Makefile | 4 +- libs/core/Makefile | 3 +- libs/filters/Makefile | 3 +- libs/gfx/Makefile | 3 +- libs/input/Makefile | 4 +- libs/loaders/Makefile | 4 +- libs/text/Makefile | 3 +- include.mk => post.mk | 25 ++- pre.mk | 1 + pylib/Makefile | 7 +- pylib/gfxprim/Makefile | 2 +- pylib/gfxprim/backends/Makefile | 4 +- pylib/gfxprim/core/Makefile | 4 +- pylib/gfxprim/filters/Makefile | 4 +- pylib/gfxprim/gfx/Makefile | 4 +- pylib/gfxprim/loaders/Makefile | 4 +- pylib/gfxprim/text/Makefile | 4 +- pywrap.mk | 2 +- tests/Makefile | 2 +- tests/SDL/Makefile | 3 +- tests/core/Makefile | 2 +- tests/drivers/Makefile | 3 +- 48 files changed, 484 insertions(+), 197 deletions(-) copy include/{loaders/GP_BMP.h => backends/GP_BackendInit.h} (67%) copy include/{backends/GP_Backends.h => input/GP_Input.h} (86%) copy include/backends/GP_Backends.h => libs/backends/GP_Backend.c (78%) create mode 100644 libs/backends/GP_BackendInit.c rename include.mk => post.mk (79%) create mode 100644 pre.mk
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.