November 2011 - Gfxprim

[repo.or.cz] gfxprim.git branch master updated: 2dd37fda71656537c85e16407173aec2ab2db70a
by gavento 22 Nov '11

22 Nov '11

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 2dd37fda71656537c85e16407173aec2ab2db70a (commit) from d9ae37cc5f8e9ab61cc0e55010b70920b0db4a11 (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/2dd37fda71656537c85e16407173aec2ab2d… commit 2dd37fda71656537c85e16407173aec2ab2db70a Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Tue Nov 22 22:58:07 2011 +0100 Add libraries to link (ugly) diff --git a/tests/core/Makefile b/tests/core/Makefile index 00e696e..7199ad2 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -2,7 +2,7 @@ TOPDIR=../.. LIBNAME=core TESTSUITE=core_suite -LDLIBS+=-lGP -L$(TOPDIR)/build/ -lcheck +LDLIBS+=-lGP -L$(TOPDIR)/build/ -lcheck -lpng -ljpeg -lm -ldl GENSOURCES+=GP_Convert.test.gen.c GP_WritePixel.test.gen.c include $(TOPDIR)/tests.mk ----------------------------------------------------------------------- Summary of changes: tests/core/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: d9ae37cc5f8e9ab61cc0e55010b70920b0db4a11
by gavento 22 Nov '11

22 Nov '11

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 d9ae37cc5f8e9ab61cc0e55010b70920b0db4a11 (commit) from add1b69ae2989c1f937746437ce9c2019171f0cc (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/d9ae37cc5f8e9ab61cc0e55010b70920b0db… commit d9ae37cc5f8e9ab61cc0e55010b70920b0db4a11 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Tue Nov 22 22:45:49 2011 +0100 Add a required header to test diff --git a/tests/core/GP_Common.test.c b/tests/core/GP_Common.test.c index 9695d93..81422fb 100644 --- a/tests/core/GP_Common.test.c +++ b/tests/core/GP_Common.test.c @@ -23,6 +23,7 @@ #include "GP_Tests.h" #include <GP_Common.h> +#include <GP_GetSetBits.h> #include <unistd.h> /* ----------------------------------------------------------------------- Summary of changes: tests/core/GP_Common.test.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: add1b69ae2989c1f937746437ce9c2019171f0cc
by gavento 22 Nov '11

22 Nov '11

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 add1b69ae2989c1f937746437ce9c2019171f0cc (commit) from 0142394bf215cdf72112a3bf89295d2d2f8c8757 (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/add1b69ae2989c1f937746437ce9c2019171… commit add1b69ae2989c1f937746437ce9c2019171f0cc Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Tue Nov 22 22:42:46 2011 +0100 Modified few C99-style for-loops to C98 diff --git a/tests/common/GP_TestingCore.c b/tests/common/GP_TestingCore.c index 501a66a..d6b49a1 100644 --- a/tests/common/GP_TestingCore.c +++ b/tests/common/GP_TestingCore.c @@ -38,8 +38,9 @@ GP_Pixel GP_RandomColor(GP_PixelType type) void GP_RandomizeRect(GP_Context *context, GP_Coord x, GP_Coord y, GP_Size w, GP_Size h) { GP_CHECK(context); - for (GP_Size i = 0; i < w; i++) - for (GP_Size j = 0; j < h; j++) + GP_Size i, j; + for (i = 0; i < w; i++) + for (j = 0; j < h; j++) GP_PutPixel(context, i + x, j + y, GP_RandomColor(context->pixel_type)); } @@ -71,8 +72,9 @@ int GP_EqualRects(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP_ { GP_CHECK(c1); GP_CHECK(c2); - for (GP_Size i = 0; i < w; i++) - for (GP_Size j = 0; j < h; j++) { + GP_Size i, j; + for (i = 0; i < w; i++) + for (j = 0; j < h; j++) { if (!GP_EqualColors(GP_GetPixel(c1, x1 + i, y1 + j), c1->pixel_type, GP_GetPixel(c2, x2 + i, y2 + j), c2->pixel_type)) return 0; diff --git a/tests/common/GP_Tests.c b/tests/common/GP_Tests.c index 2aa6811..736c05c 100644 --- a/tests/common/GP_Tests.c +++ b/tests/common/GP_Tests.c @@ -65,7 +65,8 @@ int main(int argc, char *argv[]) SRunner *sr = srunner_create(NULL); - for (SuiteFactory **s = manual_suites; *s; s++) { + SuiteFactory **s; + for (s = manual_suites; *s; s++) { srunner_add_suite(sr, (*s)()); } GP_AddSuitesToSRunner(sr); diff --git a/tests/core/GP_Counter.test.c b/tests/core/GP_Counter.test.c index 8f8ddd3..6bd9ab7 100644 --- a/tests/core/GP_Counter.test.c +++ b/tests/core/GP_Counter.test.c @@ -28,7 +28,7 @@ GP_SUITE(GP_Counter) -GP_TEST(Smoke) +GP_TEST(Smoke) { fail_unless(GP_CounterVal(NULL) == 0); GP_IncCounter(NULL); @@ -70,7 +70,8 @@ END_TEST GP_TEST(Overflow) { char buf[8]; - for (int i = 0; i < GP_COUNTER_MAX; i++) { + int i; + for (i = 0; i < GP_COUNTER_MAX; i++) { sprintf(buf, "%d", i); fail_if(GP_GetCounter(buf) == NULL); } ----------------------------------------------------------------------- Summary of changes: tests/common/GP_TestingCore.c | 10 ++++++---- tests/common/GP_Tests.c | 3 ++- tests/core/GP_Counter.test.c | 5 +++-- 3 files changed, 11 insertions(+), 7 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 0142394bf215cdf72112a3bf89295d2d2f8c8757
by gavento 22 Nov '11

22 Nov '11

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 0142394bf215cdf72112a3bf89295d2d2f8c8757 (commit) via 8def3eafd3536e4ef84e3170be720a505cba5211 (commit) from eb4a525b020632bd5011f14ff9f759eef926dee2 (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/0142394bf215cdf72112a3bf89295d2d2f8c… commit 0142394bf215cdf72112a3bf89295d2d2f8c8757 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Tue Nov 22 22:28:01 2011 +0100 Fix generated GP_TEST parameters The parameters need to be separated by commas "," diff --git a/tests/core/GP_WritePixel.test.gen.c.t b/tests/core/GP_WritePixel.test.gen.c.t index 2661371..e488ce7 100644 --- a/tests/core/GP_WritePixel.test.gen.c.t +++ b/tests/core/GP_WritePixel.test.gen.c.t @@ -49,7 +49,7 @@ static void dump_buffer(const char *name, char *buf, unsigned int buf_len) %% for offset in range(0, 4) %% for len in range(0, 6) %% for aligment in [0, 1] -GP_TEST(GP_WritePixel{{ "%i_%i_%i_%i"|format(pixelsize, offset, len, aligment) }}, {{ ""offset=%i len=%i aligment=%i""|format(offset, len, aligment) }}) +GP_TEST(GP_WritePixel{{ "%i_%i_%i_%i"|format(pixelsize, offset, len, aligment) }}, {{ ""offset=%i, len=%i, aligment=%i,""|format(offset, len, aligment) }}) { char write_buf[{{ 25 * pixelsize//8 }}] = {}; char gen_buf[{{ 25 * pixelsize//8 }}] = {}; http://repo.or.cz/w/gfxprim.git/commit/8def3eafd3536e4ef84e3170be720a505cba… commit 8def3eafd3536e4ef84e3170be720a505cba5211 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Tue Nov 22 22:26:48 2011 +0100 Fixed warning logging fixed wrong format string and arguments diff --git a/pylib/gfxprim/test_collection.py b/pylib/gfxprim/test_collection.py index db3b5b2..0d947ef 100644 --- a/pylib/gfxprim/test_collection.py +++ b/pylib/gfxprim/test_collection.py @@ -40,7 +40,7 @@ def find_tests(fname, suites): name, args = find_GP_directive("GP_SUITE", suite_re, l, fname=fname, line=i) if name: if args: - log.warn("suite should have no arguments other than name.", fname, i) + log.warning("%s:%s: Suite should have no arguments other than name.", fname, i) suites.setdefault(name, []) suite = name # Look for test declaration @@ -51,7 +51,7 @@ def find_tests(fname, suites): test_suite = args['suite'] if not test_suite: test_suite = 'default' - log.warn("No suite defined before test %s, using %r." % (name, test_suite), fname, i) + log.warning("%s:%s: No suite defined before test %s, using %r.", fname, i, name, test_suite) args['name'] = name args['fname'] = fname args['line'] = i @@ -68,9 +68,9 @@ def collect_suites(fdir): for fn in fnames: find_tests(os.path.join(fdir, fn), suites) if not fnames: - log.warn('No .test.c files found in "%s".', fdir) + log.warning('No .test.c files found in "%s".', fdir) if not suites: - log.warn('No suites found, generating an empty testsuite.') + log.warning('No suites found, generating an empty testsuite.') return suites @@ -89,7 +89,7 @@ def find_GP_directive(name, regexp, l, fname='unknown', line=0): s = 'dict( ' + d[1].strip(" tn"") + ' )' args = eval(s) except: - log.fatal("error parsing arguments: %r" % s, fname, line) + log.fatal("%s:%s: error parsing arguments: %r", fname, line, s) return d[0].strip(), args return None, None ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/test_collection.py | 10 +++++----- tests/core/GP_WritePixel.test.gen.c.t | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: eb4a525b020632bd5011f14ff9f759eef926dee2
by metan 20 Nov '11

20 Nov '11

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 eb4a525b020632bd5011f14ff9f759eef926dee2 (commit) from acea12e66ecb83f34fd19be737bddd0c289bf584 (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/eb4a525b020632bd5011f14ff9f759eef926… commit eb4a525b020632bd5011f14ff9f759eef926dee2 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Nov 20 12:34:01 2011 +0100 grinder: Add filters to save JPG/PNG. diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index 858b2a6..6f86e69 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -370,6 +370,7 @@ static const char *dither_formats[] = { "rgb333", "rgb565", "rgb666", + NULL, }; static const GP_PixelType dither_pixel_types[] = { @@ -413,6 +414,54 @@ static GP_RetCode dither(GP_Context **c, const char *params) return GP_ESUCCESS; } +/* jpg save filter */ + +static struct param save_jpg_params[] = { + {"file", PARAM_STR, "Filename to save the result", NULL, NULL}, + {NULL, 0, NULL, NULL, NULL} +}; + +static GP_RetCode save_jpg(GP_Context **c, const char *params) +{ + char *file = NULL; + + if (param_parse(params, save_jpg_params, "jpg", param_err, &file)) + return GP_EINVAL; + + if (file == NULL) { + print_error("jpg: filename missing"); + return GP_EINVAL; + } + + GP_SaveJPG(file, *c, progress_callback); + + return GP_ESUCCESS; +} + +/* png save filter */ + +static struct param save_png_params[] = { + {"file", PARAM_STR, "Filename to save the result", NULL, NULL}, + {NULL, 0, NULL, NULL, NULL} +}; + +static GP_RetCode save_png(GP_Context **c, const char *params) +{ + char *file = NULL; + + if (param_parse(params, save_png_params, "png", param_err, &file)) + return GP_EINVAL; + + if (file == NULL) { + print_error("png: filename missing"); + return GP_EINVAL; + } + + GP_SavePNG(file, *c, progress_callback); + + return GP_ESUCCESS; +} + /* filters */ struct filter { @@ -432,6 +481,8 @@ static struct filter filter_table[] = { {"invert", "inverts image", invert_params, invert}, {"blur", "gaussian blur", blur_params, blur}, {"dither", "dithers bitmap", dither_params, dither}, + {"jpg", "save jpg image", save_jpg_params, save_jpg}, + {"png", "save png image", save_png_params, save_png}, {NULL, NULL, NULL, NULL} }; diff --git a/demos/grinder/params.c b/demos/grinder/params.c index 2734980..6d2b1aa 100644 --- a/demos/grinder/params.c +++ b/demos/grinder/params.c @@ -248,6 +248,12 @@ int set_enum(int *res, char *val, const char *enums[]) return 1; } +int set_str(char **res, char *val) +{ + *res = val; + return 0; +} + #define CALL_ERR_CALLBACK(error, p, value, private) do { int error_ret; @@ -323,7 +329,11 @@ int param_parse(const char *params, const struct param *param_desc, void *priv, } break; case PARAM_STR: - + if ((ret = set_str(arg, values[pos]))) { + CALL_ERR_CALLBACK(err, &param_desc[i], + values[pos], priv); + goto err; + } break; case PARAM_ENUM: if ((ret = set_enum(arg, values[pos], ----------------------------------------------------------------------- Summary of changes: demos/grinder/grinder.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++ demos/grinder/params.c | 12 ++++++++++- 2 files changed, 62 insertions(+), 1 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: acea12e66ecb83f34fd19be737bddd0c289bf584
by metan 19 Nov '11

19 Nov '11

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 acea12e66ecb83f34fd19be737bddd0c289bf584 (commit) from 1c8bab0eb13544cbc84b504007326432f9145515 (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/acea12e66ecb83f34fd19be737bddd0c289b… commit acea12e66ecb83f34fd19be737bddd0c289bf584 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Nov 18 12:08:00 2011 +0100 loaders: Add forgotten GP_ProgressCallbackDone(). diff --git a/libs/loaders/GP_JPG.c b/libs/loaders/GP_JPG.c index cbb5758..db3de62 100644 --- a/libs/loaders/GP_JPG.c +++ b/libs/loaders/GP_JPG.c @@ -276,6 +276,7 @@ GP_RetCode GP_SaveJPG(const char *dst_path, const GP_Context *src, return GP_EBADFILE; } + GP_ProgressCallbackDone(callback); return GP_ESUCCESS; //TODO: is cinfo allocated? err1: diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c index d7da8ae..32a6358 100644 --- a/libs/loaders/GP_PNG.c +++ b/libs/loaders/GP_PNG.c @@ -296,6 +296,7 @@ GP_RetCode GP_SavePNG(const char *dst_path, const GP_Context *src, return GP_EBADFILE; } + GP_ProgressCallbackDone(callback); return GP_ESUCCESS; err2: png_destroy_write_struct(&png, png_info == NULL ? NULL : &png_info); ----------------------------------------------------------------------- Summary of changes: libs/loaders/GP_JPG.c | 1 + libs/loaders/GP_PNG.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 1c8bab0eb13544cbc84b504007326432f9145515
by metan 14 Nov '11

14 Nov '11

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 1c8bab0eb13544cbc84b504007326432f9145515 (commit) from 12140ab1df18e77ad7a07908bc1f944579eccc78 (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/1c8bab0eb13544cbc84b504007326432f914… commit 1c8bab0eb13544cbc84b504007326432f9145515 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 14 23:54:24 2011 +0100 grinder: Fix script. diff --git a/demos/grinder/runtest.sh b/demos/grinder/runtest.sh index 73c9f61..163c76c 100755 --- a/demos/grinder/runtest.sh +++ b/demos/grinder/runtest.sh @@ -7,4 +7,4 @@ PROG="$1" shift echo "LD_LIBRARY_PATH=../../build/ ./$PROG $@" -LD_LIBRARY_PATH=../../build/ ./$PROG $@ +LD_LIBRARY_PATH=../../build/ ./$PROG "$@" ----------------------------------------------------------------------- Summary of changes: demos/grinder/runtest.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 12140ab1df18e77ad7a07908bc1f944579eccc78
by metan 14 Nov '11

14 Nov '11

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 12140ab1df18e77ad7a07908bc1f944579eccc78 (commit) from db6777f82eb9c87d31fd68beed98624f4441024e (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/12140ab1df18e77ad7a07908bc1f944579ec… commit 12140ab1df18e77ad7a07908bc1f944579eccc78 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 14 23:34:53 2011 +0100 build: Fix one more Makefile. diff --git a/tests/drivers/Makefile b/tests/drivers/Makefile index 3f631db..afba820 100644 --- a/tests/drivers/Makefile +++ b/tests/drivers/Makefile @@ -1,17 +1,10 @@ -LDFLAGS=-L../../build/ -lGP -lpng -ldl -ljpeg -lm -INCLUDE=-I../../include -# Some warnings are triggered only with -O2 -# thuss added here -CFLAGS=$(INCLUDE) -ggdb -W -Wall -O2 -SOURCES=$(wildcard *.c) -TESTS=$(SOURCES:.c=) +TOPDIR=../.. -all: $(TESTS) +CSOURCES=$(shell echo *.c) -%: %.c - $(CC) $(CFLAGS) $(LDFLAGS) $(LIBRARY) $^ -o $@ +LDLIBS+=-lGP -lGP_SDL -lSDL -L$(TOPDIR)/build/ -clean: - rm -f *.o - rm -f $(TESTS) +APPS=$(CSOURCES:.c=) +include $(TOPDIR)/include.mk +include $(TOPDIR)/app.mk ----------------------------------------------------------------------- Summary of changes: tests/drivers/Makefile | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: db6777f82eb9c87d31fd68beed98624f4441024e
by metan 14 Nov '11

14 Nov '11

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 db6777f82eb9c87d31fd68beed98624f4441024e (commit) from 444015ece1a074f982dbe7d8f110f295acddc90a (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/db6777f82eb9c87d31fd68beed98624f4441… commit db6777f82eb9c87d31fd68beed98624f4441024e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 14 23:11:05 2011 +0100 build: having config removed in 'make clean' is wrong Added 'make distclean' for that. diff --git a/Makefile b/Makefile index d2d16f5..4f303c0 100644 --- a/Makefile +++ b/Makefile @@ -17,14 +17,21 @@ build: clean: ifdef VERBOSE - rm config.h config.gen.mk $(MAKE) -C build clean else - @rm config.h config.gen.mk @echo "/build" @$(MAKE) --no-print-directory -C build clean endif +distclean: +ifdef VERBOSE + rm config.h config.gen.mk + $(MAKE) clean +else + @$(MAKE) clean + @rm config.h config.gen.mk +endif + HEADER_LOC=/usr/include/ LIB_LOC=/usr/lib/ ----------------------------------------------------------------------- Summary of changes: Makefile | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 444015ece1a074f982dbe7d8f110f295acddc90a
by metan 14 Nov '11

14 Nov '11

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 444015ece1a074f982dbe7d8f110f295acddc90a (commit) from c4ae73720b3f73c4c93cc9d697c07b4353c54ce1 (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/444015ece1a074f982dbe7d8f110f295acdd… commit 444015ece1a074f982dbe7d8f110f295acddc90a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 14 21:04:59 2011 +0100 build: Fix some linker flags, needs to be fixed properly in future. diff --git a/app.mk b/app.mk index 9b31c14..0b301df 100644 --- a/app.mk +++ b/app.mk @@ -2,7 +2,7 @@ ifndef APPS $(error APPS not defined, fix your library Makefile) endif -LDFLAGS+=-lpng -ljpeg +LDLIBS+=-lpng -ljpeg -lm -ldl all: $(APPS) diff --git a/tests/drivers/Makefile b/tests/drivers/Makefile index 28ea051..3f631db 100644 --- a/tests/drivers/Makefile +++ b/tests/drivers/Makefile @@ -1,4 +1,4 @@ -LDFLAGS=-L../../build/ -lGP -lpng -ldl -ljpeg +LDFLAGS=-L../../build/ -lGP -lpng -ldl -ljpeg -lm INCLUDE=-I../../include # Some warnings are triggered only with -O2 # thuss added here ----------------------------------------------------------------------- Summary of changes: app.mk | 2 +- tests/drivers/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0