[teklib-general] teklib: Merge

[Timm S. Mueller]

details:   http://hg.teklib.org/teklib/rev/0b24cd7a0979
changeset: 218:0b24cd7a0979
user:      Timm S. Mueller <tmueller at neoscientists.org>
date:      Wed Jan 07 19:43:19 2009 +0100
description:
Merge

diffs (truncated from 19610 to 100 lines):

diff -r 79b4414d8f13 -r 0b24cd7a0979 Makefile
--- a/Makefile	Wed Jan 07 19:39:59 2009 +0100
+++ b/Makefile	Wed Jan 07 19:43:19 2009 +0100
@@ -18,8 +18,8 @@
 	@echo "Build configuration (pass as variables or override in Makefile):"
 	@echo "-------------------------------------------------------------------------------"
 	@echo "TEKLIB = ................ $(TEKLIB)"
-	@echo "PLATFORM = .............. $(PLATFORM) [available: posix]"
-	@echo "HOST = .................. $(HOST) [available: linux, fbsd]"
+	@echo "PLATFORM = .............. $(PLATFORM) [available: posix, winnt]"
+	@echo "HOST = .................. $(HOST) [available: linux, fbsd, winnt]"
 	@echo "COMPILER = .............. $(COMPILER) [available: gcc]"
 	@echo
 	@echo "Build targets:"
@@ -80,16 +80,16 @@
 
 $(TEKLIB)/bin/linux/tmkmf:
 	- at mkdir -p $(TEKLIB)/bin/linux
-	$(CC) -I$(TEKLIB) -I$(TEKLIB)/src/hal $(TEKLIB)/build/tmkmf.c -pthread -ldl -lm -o $@
+	$(CC) -Wall -I$(TEKLIB) -I$(TEKLIB)/src/hal $(TEKLIB)/build/tmkmf.c -pthread -ldl -lm -o $@
 
 $(TEKLIB)/bin/fbsd/tmkmf:
 	- at mkdir -p $(TEKLIB)/bin/fbsd
-	$(CC) -I$(TEKLIB) -I$(TEKLIB)/src/hal $(TEKLIB)/build/tmkmf.c -export-dynamic -pthread -lm -o $@
+	$(CC) -Wall -I$(TEKLIB) -I$(TEKLIB)/src/hal $(TEKLIB)/build/tmkmf.c -export-dynamic -pthread -lm -o $@
 
 $(TEKLIB)/bin/winnt/tmkmf:
 	- at mkdir -p $(TEKLIB)/bin/winnt
-	$(CC) -I$(TEKLIB) -I$(TEKLIB)/src/hal $(TEKLIB)/build/tmkmf.c -mno-cygwin -lm -lwinmm -o $@
-	#$(CC) -I$(TEKLIB) -I$(TEKLIB)/src/hal $(TEKLIB)/build/tmkmf.c -pthread -ldl -lm -o $@
+# 	$(CC) -Wall -I$(TEKLIB) -I$(TEKLIB)/src/hal $(TEKLIB)/build/tmkmf.c -mno-cygwin -lm -lwinmm -o $@
+	$(CC) -Wall -I$(TEKLIB) -I$(TEKLIB)/src/hal $(TEKLIB)/build/tmkmf.c -pthread -ldl -lm -o $@
 
 # Playstation2 is cross-built on Linux:
 $(TEKLIB)/bin/ps2/tmkmf:
diff -r 79b4414d8f13 -r 0b24cd7a0979 build/config/posix_fbsd.tmk
--- a/build/config/posix_fbsd.tmk	Wed Jan 07 19:39:59 2009 +0100
+++ b/build/config/posix_fbsd.tmk	Wed Jan 07 19:43:19 2009 +0100
@@ -142,7 +142,7 @@
 
 [body name="modbuild"]
 	MODCFLAGS	= -fPIC -DPIC $(WARN) $(OPT) $(INCL) $(DEF) $(DEBUG) -DTEKHOST_SYSDIR="\\"$(TEKSYSDIR)\\""
-	MODLIBS		= -L$(TEKLIB)/lib/$(HOST) -ltek -ltekdebug $(EXTRAMODLIBS)
+	MODLIBS		= -L$(TEKLIB)/lib/$(HOST) -ltek -ltekstring -ltekdebug $(EXTRAMODLIBS)
 	modules: $(OBJDIR) $(BINDIR) $(MODDIR) $(LIBDIR) $(LIBMODS) $(MODS)
 	install:
 		\t at echo "--- (IN) $(MODS)"
@@ -182,7 +182,7 @@
 
 [body name="toolbuild"]
 	TOOLCFLAGS	= $(WARN) $(OPT) $(INCL) $(DEF) $(DEBUG) $(EXTRATOOLINCL)
-	TOOLLIBS	= -pthread -export-dynamic -L$(TEKLIB)/lib/$(HOST) -ltekcmain -ltekdebug -lm $(EXTRATOOLLIBS)
+	TOOLLIBS	= -pthread -export-dynamic -L$(TEKLIB)/lib/$(HOST) -ltekcmain -ltekstring -ltekdebug -lm $(EXTRATOOLLIBS)
 	tools: $(BINDIR) $(OBJDIR) libs $(TOOLS)
 [/body]
 
diff -r 79b4414d8f13 -r 0b24cd7a0979 build/config/posix_linux.tmk
--- a/build/config/posix_linux.tmk	Wed Jan 07 19:39:59 2009 +0100
+++ b/build/config/posix_linux.tmk	Wed Jan 07 19:43:19 2009 +0100
@@ -142,7 +142,7 @@
 
 [body name="modbuild"]
 	MODCFLAGS	= -fPIC -DPIC $(WARN) $(OPT) $(INCL) $(DEF) $(DEBUG) -DTEKHOST_SYSDIR="\\"$(TEKSYSDIR)\\""
-	MODLIBS		= -L$(TEKLIB)/lib/$(HOST) -ltek -ltekdebug $(EXTRAMODLIBS)
+	MODLIBS		= -L$(TEKLIB)/lib/$(HOST) -ltek -ltekstring -ltekdebug $(EXTRAMODLIBS)
 	modules: $(OBJDIR) $(BINDIR) $(MODDIR) $(LIBDIR) $(LIBMODS) $(MODS)
 	install:
 		\t at echo "--- (IN) $(MODS)"
@@ -182,7 +182,7 @@
 
 [body name="toolbuild"]
 	TOOLCFLAGS	= $(WARN) $(OPT) $(INCL) $(DEF) $(DEBUG) $(EXTRATOOLINCL)
-	TOOLLIBS	= -ldl -lpthread -L$(TEKLIB)/lib/$(HOST) -ltekcmain -ltekdebug -lm $(EXTRATOOLLIBS)
+	TOOLLIBS	= -ldl -lpthread -L$(TEKLIB)/lib/$(HOST) -ltekcmain -ltekstring -ltekdebug -lm $(EXTRATOOLLIBS)
 	tools: $(BINDIR) $(OBJDIR) libs $(TOOLS)
 [/body]
 
diff -r 79b4414d8f13 -r 0b24cd7a0979 build/config/ps2_ps2_gcc.tmk
--- a/build/config/ps2_ps2_gcc.tmk	Wed Jan 07 19:39:59 2009 +0100
+++ b/build/config/ps2_ps2_gcc.tmk	Wed Jan 07 19:43:19 2009 +0100
@@ -36,7 +36,7 @@
 
 	PARENT      = ../
 	DEF			= -DTEKLIB -DTSYS_PS2 $(EXTRADEFS)
-	WARN		= -Wall
+	WARN		= -Wall -Wno-unused-parameter
 
 	MKDIR       = mkdir -p
 	RM          = rm
@@ -154,7 +154,7 @@
 
 [body name="modbuild"]
 	MODCFLAGS	= $(CFLAGS) $(WARN) $(OPT) $(INCL) $(DEF) $(DEBUG)
-	MODLIBS		= -L$(TEKLIB)/lib/$(HOST) -ltek -ltekdebug $(EXTRAMODLIBS)
+	MODLIBS		= -L$(TEKLIB)/lib/$(HOST) -ltek -ltekstring -ltekdebug $(EXTRAMODLIBS)
 		#-lm
 	modules: $(OBJDIR) $(BINDIR) $(MODDIR) $(LIBDIR) $(LIBMODS)
 	install:
@@ -193,7 +193,7 @@
 	TOOLCFLAGS	= $(CFLAGS) $(WARN) $(OPT) $(INCL) $(DEF) $(DEBUG) $(EXTRATOOLINCL)