Release-1.5.4-20080101

6 files changed, 71 insertions, 6 deletions

diff --git a/tmake/lib/aix-xlc/tmake.conf b/tmake/lib/aix-xlc/tmake.conf
index 04d5f15..4013923 100755
--- a/tmake/lib/aix-xlc/tmake.conf
+++ b/tmake/lib/aix-xlc/tmake.conf
@@ -8,12 +8,10 @@ TEMPLATE		= app
 CONFIG			= qt warn_on release
 
 TMAKE_CC		= xlc
-#TMAKE_CC		= xlC
-TMAKE_CFLAGS		= -+ -qstrict -D_BSD
+TMAKE_CFLAGS		= -qstrict 
 TMAKE_CFLAGS_WARN_ON	=
 TMAKE_CFLAGS_WARN_OFF	=
 TMAKE_CFLAGS_RELEASE	= -O
-#TMAKE_CFLAGS_RELEASE	= -O3
 TMAKE_CFLAGS_DEBUG	= -g
 TMAKE_CFLAGS_SHLIB	=
 TMAKE_CFLAGS_YACC	=
@@ -50,7 +48,7 @@ TMAKE_LFLAGS_DEBUG	=
 TMAKE_LFLAGS_SHLIB	=
 TMAKE_LFLAGS_SONAME	=
 
-TMAKE_LIBS		=
+TMAKE_LIBS		= -liconv
 TMAKE_LIBS_X11		= -lXext -lX11 -lm
 TMAKE_LIBS_QT		= -lqt
 TMAKE_LIBS_QT_MT	= -lqt-mt
diff --git a/tmake/lib/macosx-uni-c++/tmake.conf b/tmake/lib/macosx-uni-c++/tmake.conf
index dbdece6..2ac8534 100644
--- a/tmake/lib/macosx-uni-c++/tmake.conf
+++ b/tmake/lib/macosx-uni-c++/tmake.conf
@@ -8,7 +8,7 @@ TEMPLATE		= app
 CONFIG			= qt warn_on release
 
 TMAKE_CC		= cc
-TMAKE_CFLAGS		= -pipe -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc
+TMAKE_CFLAGS		= -pipe -arch i386 -arch ppc
 TMAKE_CFLAGS_WARN_ON	= -Wall -W
 TMAKE_CFLAGS_WARN_OFF	=
 TMAKE_CFLAGS_RELEASE	= -O2
@@ -36,7 +36,7 @@ TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 TMAKE_LINK		= c++
 TMAKE_LINK_SHLIB	= c++
-TMAKE_LFLAGS		= -Wl,-search_paths_first -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc
+TMAKE_LFLAGS		= -Wl,-search_paths_first -arch i386 -arch ppc
 TMAKE_LFLAGS_RELEASE	=
 TMAKE_LFLAGS_DEBUG	=
 TMAKE_LFLAGS_SHLIB	= -shared
diff --git a/tmake/lib/solaris-cc-64/app.t b/tmake/lib/solaris-cc-64/app.t
new file mode 100644
index 0000000..867725e
--- /dev/null
+++ b/tmake/lib/solaris-cc-64/app.t
@@ -0,0 +1,2 @@
+#! Use the common Unix template
+#$ IncludeTemplate("../unix/app.t");
diff --git a/tmake/lib/solaris-cc-64/lib.t b/tmake/lib/solaris-cc-64/lib.t
new file mode 100644
index 0000000..2523b2f
--- /dev/null
+++ b/tmake/lib/solaris-cc-64/lib.t
@@ -0,0 +1,2 @@
+#! Use the common Unix template
+#$ IncludeTemplate("../unix/lib.t");
diff --git a/tmake/lib/solaris-cc-64/subdirs.t b/tmake/lib/solaris-cc-64/subdirs.t
new file mode 100644
index 0000000..5e888af
--- /dev/null
+++ b/tmake/lib/solaris-cc-64/subdirs.t
@@ -0,0 +1,2 @@
+#! Use the common Unix template
+#$ IncludeTemplate("../unix/subdirs.t");
diff --git a/tmake/lib/solaris-cc-64/tmake.conf b/tmake/lib/solaris-cc-64/tmake.conf
new file mode 100644
index 0000000..889fde7
--- /dev/null
+++ b/tmake/lib/solaris-cc-64/tmake.conf
@@ -0,0 +1,61 @@
+#
+# 
+#
+# tmake configuration for solaris-cc
+#
+
+TEMPLATE		= app
+CONFIG			= qt warn_on release
+
+TMAKE_CC		= cc
+TMAKE_CFLAGS		= -xtarget=generic64
+TMAKE_CFLAGS_WARN_ON	=
+TMAKE_CFLAGS_WARN_OFF	= -w
+TMAKE_CFLAGS_RELEASE	= -O
+TMAKE_CFLAGS_DEBUG	= -g
+TMAKE_CFLAGS_SHLIB	= -KPIC
+TMAKE_CFLAGS_YACC	=
+
+TMAKE_CXX		= CC
+TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
+TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
+TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
+TMAKE_CXXFLAGS_RELEASE	= -xO2
+TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
+TMAKE_CXXFLAGS_SHLIB	= -PIC
+TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
+
+TMAKE_INCDIR		=
+TMAKE_LIBDIR		=
+TMAKE_INCDIR_X11	= /usr/openwin/include
+TMAKE_LIBDIR_X11	= /usr/openwin/lib
+TMAKE_INCDIR_QT		= $(QTDIR)/include
+TMAKE_LIBDIR_QT		= $(QTDIR)/lib
+TMAKE_INCDIR_OPENGL	=
+TMAKE_LIBDIR_OPENGL	=
+
+TMAKE_LINK		= CC
+# Jan Wortelboer <janw@wins.uva.nl> suggests avoiding $LD_LIBRARY_PATH:
+TMAKE_LINK_SHLIB	= CC -R$(QTDIR)/lib:/usr/openwin/lib
+TMAKE_LFLAGS		= -64 -xtarget=generic64
+TMAKE_LFLAGS_RELEASE	=
+TMAKE_LFLAGS_DEBUG	=
+TMAKE_LFLAGS_SHLIB	= -G -h $(TARGET1)
+TMAKE_LFLAGS_SONAME	=
+
+TMAKE_LIBS		= 
+TMAKE_LIBS_X11		= -lXext -lX11 -lm -lICE -lSM
+TMAKE_LIBS_QT		= -lqt
+TMAKE_LIBS_QT_MT	= -lqt-mt
+TMAKE_LIBS_QT_OPENGL	= -lqgl -lGL
+TMAKE_LIBS_OPENGL	= -lGL -lGLU -lXmu
+
+TMAKE_MOC		= moc
+
+TMAKE_AR		= CC -xar -o
+TMAKE_RANLIB		=
+
+TMAKE_CLEAN		= -r Templates.DB
+
+TMAKE_TAR		= tar -cf
+TMAKE_GZIP		= gzip -9f