[teklib-general] teklib: bashing example: corrected C++ style variable scope; Sta...

[Timm S. Mueller]

details:   http://hg.teklib.org/teklib/rev/8eb5c4a30807
changeset: 165:8eb5c4a30807
user:      Timm S. Mueller <tmueller at neoscientists.org>
date:      Tue Apr 01 10:58:00 2008 +0200
description:
bashing example: corrected C++ style variable scope; Started merging build
configurations for the PS2 back in; display_x11: started using symbolic debug
levels

diffs (truncated from 116 to 100 lines):

diff -r e5f430b535e8 -r 8eb5c4a30807 Makefile
--- a/Makefile	Tue Apr 01 06:05:21 2008 +0200
+++ b/Makefile	Tue Apr 01 10:58:00 2008 +0200
@@ -113,6 +113,35 @@ winnt_gcc_make: bin/winnt/tmkmf
 	bin/winnt/tmkmf -q -r -c winnt_winnt_gcc
 
 ###############################################################################
+#	ps2:
+
+$(TEKLIB)/bin/ps2/tmkmf:
+	- at mkdir -p $(TEKLIB)/bin/ps2
+	$(CC) -I$(TEKLIB) -I$(TEKLIB)/src/hal $(TEKLIB)/build/tmkmf.c -pthread -ldl -lm -o $@
+build/tmk_ps2_ps2_gcc: $(TEKLIB)/bin/ps2/tmkmf
+	$(TEKLIB)/bin/ps2/tmkmf -q -r -c ps2_ps2_gcc
+build/tmk_ps2_ps2_gcc_gcc_release: $(TEKLIB)/bin/ps2/tmkmf
+	$(TEKLIB)/bin/ps2/tmkmf -q -r -c ps2_ps2_gcc_gcc_release
+build/tmk_ps2_ps2_gcc_gcc_debug: $(TEKLIB)/bin/ps2/tmkmf
+	$(TEKLIB)/bin/ps2/tmkmf -q -r -c ps2_ps2_gcc_gcc_debug
+ps2: build/tmk_ps2_ps2_gcc
+	@TEKLIB=$(TEKLIB) $(MAKE) -s -f $? all
+ps2_clean: build/tmk_ps2_ps2_gcc
+	@TEKLIB=$(TEKLIB) $(MAKE) -s -f $? clean
+ps2_release: build/tmk_ps2_ps2_gcc_gcc_release
+	@TEKLIB=$(TEKLIB) $(MAKE) -s -f $? all
+ps2_install: build/tmk_ps2_ps2_gcc
+	@TEKLIB=$(TEKLIB) $(MAKE) -s -f $? install
+ps2_debug: build/tmk_ps2_ps2_gcc_gcc_debug
+	@TEKLIB=$(TEKLIB) $(MAKE) -s -f $? all
+ps2_modules: build/tmk_ps2_ps2_gcc
+	@TEKLIB=$(TEKLIB) $(MAKE) -s -f $? modules
+ps2_libs: build/tmk_ps2_ps2_gcc
+	@TEKLIB=$(TEKLIB) $(MAKE) -s -f $? libs
+ps2_make: $(TEKLIB)/bin/ps2/tmkmf
+	$(TEKLIB)/bin/ps2/tmkmf -q -r -c ps2_ps2_gcc
+
+###############################################################################
 #	Common targets on all platforms:
 
 release: $(PLATFORM)_release
diff -r e5f430b535e8 -r 8eb5c4a30807 build/config.tmk
--- a/build/config.tmk	Tue Apr 01 06:05:21 2008 +0200
+++ b/build/config.tmk	Tue Apr 01 10:58:00 2008 +0200
@@ -9,4 +9,7 @@
 	[case config="winnt_winnt_gcc"]
 		[include name="config/winnt_winnt_gcc.tmk"/]
 	[/case]
+	[case config="ps2_ps2_gcc"]
+		[include name="config/ps2_ps2_gcc.tmk"/]
+	[/case]
 [/switch]
diff -r e5f430b535e8 -r 8eb5c4a30807 src/display_x11/display_x11_font.c
--- a/src/display_x11/display_x11_font.c	Tue Apr 01 06:05:21 2008 +0200
+++ b/src/display_x11/display_x11_font.c	Tue Apr 01 10:58:00 2008 +0200
@@ -809,7 +809,7 @@ x11_hostopenfont(TMOD_X11 *mod, TTAGITEM
 					fn->attr |= FNT_BOLD;
 
 				/* append to the list of open fonts */
-				TDBPRINTF(10, ("O '%s' %dpx\n", fattr.fname, fattr.fpxsize));
+				TDBPRINTF(TDB_WARN, ("O '%s' %dpx\n", fattr.fname, fattr.fpxsize));
 				TAddTail(&mod->x11_fm.openfonts, &fn->handle.thn_Node);
 				font = (TAPTR)fn;
 			}
@@ -870,7 +870,7 @@ hostopenfont(TMOD_X11 *mod, struct FontN
 				FNT_DEFREGENC
 			);
 
-			TDBPRINTF(10, ("? %s\n", fquery));
+			TDBPRINTF(TDB_WARN, ("? %s\n", fquery));
 
 			fn->font = XLoadQueryFont(mod->x11_Display, fquery);
 
diff -r e5f430b535e8 -r 8eb5c4a30807 src/visual/tests/bashing.c
--- a/src/visual/tests/bashing.c	Tue Apr 01 06:05:21 2008 +0200
+++ b/src/visual/tests/bashing.c	Tue Apr 01 10:58:00 2008 +0200
@@ -108,8 +108,10 @@ TTASKENTRY TVOID efxfunc(TAPTR task)
 	do
 	{
 		TFLOAT sec;
+		TTAGITEM *tp;
+
 		TQueryTime(data->treq, &t0);
-		TTAGITEM *tp = data->drawtags;
+		tp = data->drawtags;
 
 		tp->tti_Tag = TVisualDraw_FgPen;
 		(tp++)->tti_Value = data->backpen;
diff -r e5f430b535e8 -r 8eb5c4a30807 tek/config.h
--- a/tek/config.h	Tue Apr 01 06:05:21 2008 +0200
+++ b/tek/config.h	Tue Apr 01 10:58:00 2008 +0200
@@ -18,6 +18,8 @@
 		#define TSYS_WINNT
 	#endif
 	#include <tek/config/winnt.h>
+#elif defined(TSYS_PS2)
+	#include <tek/config/ps2.h>
 #endif
 
 /*****************************************************************************/
@@ -59,7 +61,7 @@
 #endif