5 files changed, 270 insertions, 0 deletions
diff --git a/tmake/lib/win32-watcom/app.t b/tmake/lib/win32-watcom/app.t
new file mode 100755
index 0000000..fc4dc2c
--- /dev/null
+++ b/tmake/lib/win32-watcom/app.t
@@ -0,0 +1,6 @@
+#############################################################################
+#!
+#! This is a tmake template for building Win32 applications.
+#!
+#$ Project('TMAKE_APP_FLAG = 1');
+#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-watcom/generic.t b/tmake/lib/win32-watcom/generic.t
new file mode 100755
index 0000000..a8c3990
--- /dev/null
+++ b/tmake/lib/win32-watcom/generic.t
@@ -0,0 +1,202 @@
+#!
+#! This is a tmake template for building Win32 applications or libraries.
+#!
+#${
+    if ( Config("qt") ) {
+	if ( $ENV{"QT_DLL"} && !$ENV{"QT_NODLL"} ) {
+	    Project('TMAKE_QT_DLL = 1');
+	    if ( Project("TARGET") eq "qt" ) {
+		Project('CONFIG += dll');
+	    }
+	}
+    }
+    if ( Config("dll") || Project("TMAKE_APP_FLAG") ) {
+	Project('CONFIG -= staticlib');
+	Project('TMAKE_APP_OR_DLL = 1');
+    } else {
+	Project('CONFIG += staticlib');
+    }
+    if ( Config("warn_off") ) {
+	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF');
+    } elsif ( Config("warn_on") ) {
+	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON');
+    }
+    if ( Config("debug") ) {
+	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG');
+	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG');
+    } elsif ( Config("release") ) {
+	Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE');
+	Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE');
+    }
+    if ( Config("qt") || Config("opengl") ) {
+	Project('CONFIG += windows' );
+    }
+    if ( Config("qt") ) {
+	$moc_aware = 1;
+	AddIncludePath(Project('TMAKE_INCDIR_QT'));
+	if ( Config("opengl") ) {
+	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL');
+	}
+	if ( Project("TARGET") eq "qt" ) {
+	    if ( Project("TMAKE_QT_DLL") && !(Project("DEFINES") =~ /QT_NODLL/) ) {
+		Project('DEFINES *= QT_MAKEDLL');
+	    }
+	} else {
+	    if ( Project("TMAKE_QT_DLL") && !(Project("DEFINES") =~ /QT_NODLL/) ) {
+		Project('DEFINES *= QT_DLL');
+	    }
+	    Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT');
+	    if ( (Project("DEFINES") =~ /QT_DLL/) ) {
+		my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt");
+		Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/");
+		Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL');
+	    }
+	}
+    }
+    if ( Config("opengl") ) {
+	Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL');
+    }
+    if ( Config("dll") ) {
+	Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE_DLL');
+	Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS_DLL');
+	if ( Project("TMAKE_LIB_FLAG") ) {
+	    my $ver = Project("VERSION");
+	    $ver =~ s/\.//g;
+	    $project{"TARGET_EXT"} = "${ver}.dll";
+	} else {
+	    $project{"TARGET_EXT"} = ".dll";
+	}
+    } else {
+	Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE');
+	Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS');
+	if ( Project('TMAKE_APP_FLAG') ) {
+	    $project{"TARGET_EXT"} = ".exe";
+	} else {
+	    $project{"TARGET_EXT"} = ".lib";
+	}
+    }
+    if ( Config("windows") ) {
+	if ( Config("console") ) {
+	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
+	    Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
+	} else {
+	    Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_WINDOWS_ANY');
+	}
+	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_WINDOWS');
+    } else {
+	Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
+	Project('TMAKE_LIBS   *= $$TMAKE_LIBS_CONSOLE');
+    }
+    Project('TMAKE_LIBS += $$LIBS');
+    Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS');
+    foreach ( split(/\s/,Project('TMAKE_FILETAGS')) ) {
+	$project{$_} =~ s-[/\\]+-\\-g;
+    }
+    if ( Project('DEF_FILE') ) {
+	Project('TMAKE_LFLAGS *= /DEF:$$DEF_FILE');
+    }
+    if ( Project('RC_FILE') ) {
+	if ( Project('RES_FILE') ) {
+	    tmake_error("Both .rc and .res file specified.\n" .
+			"Please specify one of them, not both.");
+	}
+	$project{"RES_FILE"} = $project{"RC_FILE"};
+	$project{"RES_FILE"} =~ s/\.rc$/.res/i;
+	Project('TARGETDEPS += $$RES_FILE');
+    }
+    if ( Project('RES_FILE') ) {
+	Project('TMAKE_LIBS *= $$RES_FILE');
+    }
+    $linebreak = '&';
+    StdInit();
+    $project{"DESTDIR"} = FixPath($project{"DESTDIR"});
+    if ( Project("VERSION") ) {
+	$project{"VER_MAJ"} = $project{"VERSION"};
+	$project{"VER_MAJ"} =~ s/\.\d+$//;
+	$project{"VER_MIN"} = $project{"VERSION"};
+	$project{"VER_MIN"} =~ s/^\d+\.//;
+    }    
+#$}
+#!
+# Makefile for building #$ Expand("TARGET")
+# Generated by tmake at #$ Now();
+#     Project: #$ Expand("PROJECT");
+#    Template: #$ Expand("TEMPLATE");
+#############################################################################
+
+####### Compiler, tools and options
+
+#$ Config("qt") || DisableOutput();
+QTDIR	=	#$ $text = $ENV{"QTDIR"};
+#$ Config("qt") || EnableOutput();
+CC	=	#$ Expand("TMAKE_CC");
+CFLAGS	=	#$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-d="," -d=","");
+INCPATH	=	#$ ExpandGlue("INCPATH","-i="," -i=","");
+#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput();
+LINK	=	#$ Expand("TMAKE_LINK");
+LFLAGS	=	#$ Expand("TMAKE_LFLAGS");
+LIBS	=	#$ Expand("TMAKE_LIBS");
+#$ !Project("TMAKE_APP_OR_DLL") && EnableOutput();
+#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
+LIB	=	#$ Expand("TMAKE_LIB");
+#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
+MOC	=	#$ Expand("TMAKE_MOC");
+
+ZIP	=	#$ Expand("TMAKE_ZIP");
+
+####### Files
+
+HEADERS =	#$ ExpandList("HEADERS");
+SOURCES =	#$ ExpandList("SOURCES");
+OBJECTS =	#$ ExpandList("OBJECTS");
+SRCMOC	=	#$ ExpandList("SRCMOC");
+OBJMOC	=	#$ ExpandList("OBJMOC");
+DIST	=	#$ ExpandList("DISTFILES");
+TARGET	=	#$ ExpandGlue("TARGET",$project{"DESTDIR"},"",$project{"TARGET_EXT"});
+TMPLIST =	#$ ExpandGlue("TARGET","","",".lst");
+####### Build rules
+
+all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)';
+
+$(TARGET): $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS");
+	@%create $(TMPLIST)
+#$ Project("TMAKE_APP_OR_DLL") || DisableOutput();
+	@%append $(TMPLIST) NAME #$ Expand("TARGET");
+	#$ ExpandGlue("OBJECTS",'@%append $(TMPLIST) FIL ',",","");
+	#$ ExpandGlue("OBJMOC" ,'@%append $(TMPLIST) FIL ',",","");
+	#$ ExpandGlue("TMAKE_LIBS" ,'@%append $(TMPLIST) LIBR ',",","");
+	$(LINK) $(LFLAGS) @$(TMPLIST)
+#$ Project("TMAKE_APP_OR_DLL") || EnableOutput();
+#$ Project("TMAKE_APP_OR_DLL") && DisableOutput();
+	@for %i in ( $(OBJECTS) $(OBJMOC) ) do @%append $(TMPLIST) +'%i'
+	$(LIB) $(TARGET) @$(TMPLIST)
+#$ Project("TMAKE_APP_OR_DLL") && EnableOutput();
+	del $(TMPLIST)
+#$ (Config("dll") && Project("DLLDESTDIR")) || DisableOutput();
+	-copy $(TARGET) #$ Expand("DLLDESTDIR");
+#$ (Config("dll") && Project("DLLDESTDIR")) || EnableOutput();
+#$ Project('RC_FILE') || DisableOutput();
+
+#$ Substitute("\$\$RES_FILE: \$\$RC_FILE\n\t\$\$TMAKE_RC \$\$RC_FILE");
+#$ Project('RC_FILE') || EnableOutput();
+
+moc: $(SRCMOC)
+
+#$ TmakeSelf();
+
+dist:
+	#$ Substitute('$(ZIP) $$PROJECT.zip $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)');
+
+clean:
+	#$ ExpandGlue("OBJECTS","-del ","\n\t-del ","");
+	#$ ExpandGlue("SRCMOC" ,"-del ","\n\t-del ","");
+	#$ ExpandGlue("OBJMOC" ,"-del ","\n\t-del ","");
+	-del $(TARGET)
+	#$ ExpandGlue("CLEAN_FILES","-del ","\n\t-del ","");
+
+####### Compile
+
+#$ BuildObj(Project("OBJECTS"),Project("SOURCES"));
+#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC"));
+#$ BuildMocSrc(Project("HEADERS"));
+#$ BuildMocSrc(Project("SOURCES"));
diff --git a/tmake/lib/win32-watcom/lib.t b/tmake/lib/win32-watcom/lib.t
new file mode 100755
index 0000000..d8ac6c7
--- /dev/null
+++ b/tmake/lib/win32-watcom/lib.t
@@ -0,0 +1,6 @@
+#############################################################################
+#!
+#! This is a tmake template for building Win32 libraries.
+#!
+#$ Project('TMAKE_LIB_FLAG = 1');
+#$ IncludeTemplate("generic.t");
diff --git a/tmake/lib/win32-watcom/subdirs.t b/tmake/lib/win32-watcom/subdirs.t
new file mode 100755
index 0000000..8b881ab
--- /dev/null
+++ b/tmake/lib/win32-watcom/subdirs.t
@@ -0,0 +1,2 @@
+#! Use the common Win32 template
+#$ IncludeTemplate("../win32/subdirs.t");
diff --git a/tmake/lib/win32-watcom/tmake.conf b/tmake/lib/win32-watcom/tmake.conf
new file mode 100755
index 0000000..3a3e0bf
--- /dev/null
+++ b/tmake/lib/win32-watcom/tmake.conf
@@ -0,0 +1,54 @@
+#
+# $Id$
+#
+# tmake configuration for Win32/Watcom C++
+#
+
+TEMPLATE		= app
+CONFIG			= qt warn_on release
+
+TMAKE_CC		= wcl386
+TMAKE_CFLAGS		= -zq
+TMAKE_CFLAGS_WARN_ON	= -w2
+TMAKE_CFLAGS_WARN_OFF	= -w0
+TMAKE_CFLAGS_RELEASE	= -ox
+TMAKE_CFLAGS_DEBUG	= -d2
+TMAKE_CFLAGS_YACC	=
+
+TMAKE_CXX		= $$TMAKE_CC
+TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
+TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
+TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
+TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
+TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
+TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
+
+TMAKE_INCDIR		=
+TMAKE_INCDIR_QT		= $(QTDIR)\include
+
+TMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -fo=$obj $src
+TMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src
+
+TMAKE_LINK		= wlink
+TMAKE_LFLAGS		= op quiet op c
+TMAKE_LFLAGS_RELEASE	=
+TMAKE_LFLAGS_DEBUG	= d all
+TMAKE_LFLAGS_CONSOLE	= sys nt
+TMAKE_LFLAGS_WINDOWS	= sys nt_win
+TMAKE_LFLAGS_CONSOLE_DLL= sys nt
+TMAKE_LFLAGS_WINDOWS_DLL= sys nt_win
+
+TMAKE_LIBS		=
+TMAKE_LIBS_CONSOLE	=
+TMAKE_LIBS_WINDOWS	=
+TMAKE_LIBS_QT		= %QTDIR%\lib\qt.lib
+TMAKE_LIBS_QT_DLL	= %QTDIR%\lib\qtmain.lib
+TMAKE_LIBS_QT_OPENGL	= %QTDIR%\lib\qgl.lib
+TMAKE_LIBS_OPENGL	= opengl32.lib
+
+TMAKE_MOC		= moc
+
+TMAKE_LIB		= wlib -b -c -n -q -p=512
+TMAKE_RC		= rc
+
+TMAKE_ZIP		= zip -r -9