Temporary ugly trick to make release for OpenWatcom possible.

[wxWidgets.git] / distrib / msw / tmake / wat.t

diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t
index bd4895007ca26a8ee1766b46b46f0fe99fb8aebb..66ac91e57befce6698109e1f598114efbaffa783 100644 (file)
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -2,13 +2,10 @@
 #! File:    wat.t
 #! Purpose: tmake template file from which makefile.wat is generated by running
 #!          tmake -t wat wxwin.pro -o makefile.wat
 #! File:    wat.t
 #! Purpose: tmake template file from which makefile.wat is generated by running
 #!          tmake -t wat wxwin.pro -o makefile.wat

-#!          TODO:
-#!            - extended.c, unzip.c must be compiled with $(CC), not $(CCC).
-#!            - extended.c, unzip.c targets must be as per b32.t etc.
-#!            - OLE files not generated correctly (need 'ole/' directory)

 #! Author:  Vadim Zeitlin
 #! Created: 14.07.99
 #! Version: $Id$
 #! Author:  Vadim Zeitlin
 #! Created: 14.07.99
 #! Version: $Id$

+#! Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch

 #!#############################################################################
 #${
     #! include the code which parses filelist.txt file and initializes
 #!#############################################################################
 #${
     #! include the code which parses filelist.txt file and initializes


@@ -28,8 +25,17 @@
         $file =~ s/cp?p?$/obj/;
         $project{$tag} .= $file . " "
     }
         $file =~ s/cp?p?$/obj/;
         $project{$tag} .= $file . " "
     }

+    
+    foreach $file (sort keys %wxHTML) {
+        next if $wxHTML{$file} =~ /\b16\b/;
+
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXHTMLOBJS"} .= $file . " "
+    }

 
     foreach $file (sort keys %wxCommon) {
 
     foreach $file (sort keys %wxCommon) {

+        next if $wxCommon{$file} =~ /\b(16|U)\b/;
+

         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
         $project{"WXCOMMONOBJS"} .= $file . " ";
         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
         $project{"WXCOMMONOBJS"} .= $file . " ";


@@ -40,7 +46,7 @@
         #! these files don't compile
         next if $file =~ /^pnghand\./;
 
         #! these files don't compile
         next if $file =~ /^pnghand\./;
 

-#!        next if $wxGeneric{$file} =~ /\b16\b/;
+        next if $wxMSW{$file} =~ /\b16\b/;

 
         my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
         my $isCFile = $file =~ /\.c$/;
 
         my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
         my $isCFile = $file =~ /\.c$/;


@@ -53,7 +59,7 @@
 #! an attempt to embed '#' directly in the string somehow didn't work...
 #$ $text = chr(35) . '!/binb/wmake.exe';
 
 #! an attempt to embed '#' directly in the string somehow didn't work...
 #$ $text = chr(35) . '!/binb/wmake.exe';
 

-# This file was automatically generated by tmake at #$ Now()
+# This file was automatically generated by tmake 

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #


@@ -62,63 +68,58 @@
 # Created:  1998
 #
 # Makefile : Builds wxWindows library for Watcom C++, WIN32
 # Created:  1998
 #
 # Makefile : Builds wxWindows library for Watcom C++, WIN32

-#
-# NOTE: This file is generated from wat.t by tmake, but not all bugs have
-# been removed from this process. If wxWindows doesn't compile,
-# check the following and edit this makefile accordingly:
-#
-# - OLE-related files such as oleutils.cpp should have 'ole\' prepended
-#   to the path.
-# - extended.c, gsocket.c, unzip.c must be compiled using $(CC), not $(CCC).
-#   They may also be wrongly specified as extended.cpp, etc.
+!include ..\makewat.env

 
 

-WXDIR = ..\..
+LIBTARGET   = $(WXDIR)\lib\$(LIBNAME).lib

 
 

-!include $(WXDIR)\src\makewat.env
-
-WXLIB = $(WXDIR)\lib
-
-LIBTARGET   = $(WXLIB)\wx.lib
-DUMMY=dummydll
-# ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
-
-EXTRATARGETS = png zlib jpeg tiff
-EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff
+EXTRATARGETS = png zlib jpeg tiff regex
+EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex

 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
 JPEGDIR=$(WXDIR)\src\jpeg
 TIFFDIR=$(WXDIR)\src\tiff
 MSWDIR=$(WXDIR)\src\msw
 OLEDIR=$(MSWDIR)\ole
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
 JPEGDIR=$(WXDIR)\src\jpeg
 TIFFDIR=$(WXDIR)\src\tiff
 MSWDIR=$(WXDIR)\src\msw
 OLEDIR=$(MSWDIR)\ole

+HTMLDIR=$(WXDIR)\src\html

 
 DOCDIR = $(WXDIR)\docs
 
 
 DOCDIR = $(WXDIR)\docs
 

-GENERICOBJS= #$ ExpandGlue("WXGENERICOBJS", "", " &\n\t")
+GENERICOBJS= #$ ExpandGlue("WXGENERICOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")

 
 # These are generic things that don't need to be compiled on MSW,
 # but sometimes it's useful to do so for testing purposes.
 
 # These are generic things that don't need to be compiled on MSW,
 # but sometimes it's useful to do so for testing purposes.

-NONESSENTIALOBJS= #$ ExpandGlue("WXNONESSENTIALOBJS", "", " &\n\t")
+NONESSENTIALOBJS= #$ ExpandGlue("WXNONESSENTIALOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")

 
 COMMONOBJS = &
 
 COMMONOBJS = &

-       y_tab.obj &
-       #$ ExpandGlue("WXCOMMONOBJS", "", " &\n\t")
+       #$ ExpandGlue("WXCOMMONOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")

 
 

-MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "", " &\n\t")
+MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
+
+HTMLOBJS = #$ ExpandGlue("WXHTMLOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")

 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.

-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)

 
 

-all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
+SETUP_H=$(ARCHINCDIR)\wx\setup.h

 
 

-$(LIBTARGET) : $(OBJECTS)
-    %create tmp.lbc
-    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
-    wlib /b /c /n /p=512 $^@ @tmp.lbc
+all: $(SETUP_H) $(OUTPUTDIR) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC

 
 

-#test : $(OBJECTS)
-#    %create tmp.lbc
-#    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
-#    wlib /b /c /n /p=512 $^@ @tmp.lbc
+$(ARCHINCDIR)\wx:
+       mkdir $(ARCHINCDIR)
+       mkdir $(ARCHINCDIR)\wx
+
+$(OUTPUTDIR):
+       @if not exist $^@ mkdir $^@
+
+$(SETUP_H): $(ARCHINCDIR)\wx
+    if not exist $(WXDIR)\include\wx\msw\setup.h copy $(WXDIR)\include\wx\msw\setup0.h $(WXDIR)\include\wx\msw\setup.h
+       copy $(WXDIR)\include\wx\msw\setup.h $@
+
+LBCFILE=wx$(TOOLKIT).lbc
+$(LIBTARGET) : $(OBJECTS)
+    %create $(LBCFILE)
+    @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
+    wlib /b /c /n $(LIBPAGESIZE) $^@ @$(LBCFILE)

 
 
 clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)
 
 
 clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)


@@ -134,7 +135,7 @@ cleanall:   clean
     $_ = $project{"WXMSWOBJS"};
     my @objs = split;
     foreach (@objs) {
     $_ = $project{"WXMSWOBJS"};
     my @objs = split;
     foreach (@objs) {

-        $text .= $_ . ':     $(';
+        $text .= "\$(OUTPUTDIR)\\" . $_ . ':     $(';

         s/\.obj$//;
         if ( $project{"WXOLEOBJS"} =~ /\b\Q$_\E\b/ ) {
             $text .= 'OLEDIR)\\';
         s/\.obj$//;
         if ( $project{"WXOLEOBJS"} =~ /\b\Q$_\E\b/ ) {
             $text .= 'OLEDIR)\\';


@@ -145,13 +146,15 @@ cleanall:   clean
         if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) {
             $suffix = "c";
             $cc="CC";
         if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) {
             $suffix = "c";
             $cc="CC";

+            $flags="CFLAGS";

         }
         else {
             $suffix = "cpp";
         }
         else {
             $suffix = "cpp";

-            $cc="CCC";
+            $cc="CXX";
+            $flags="CXXFLAGS";

         }
         $text .= $_ . ".$suffix\n" .
         }
         $text .= $_ . ".$suffix\n" .

-                 "  *\$($cc) \$(CPPFLAGS) \$(IFLAGS) \$<" . "\n\n";
+                 "  *\$($cc) \$($flags) \$<" . "\n\n";

     }
 #$}
 
     }
 #$}
 


@@ -162,33 +165,25 @@ cleanall:   clean
     $_ = $project{"WXCOMMONOBJS"};
     my @objs = split;
     foreach (@objs) {
     $_ = $project{"WXCOMMONOBJS"};
     my @objs = split;
     foreach (@objs) {

-        $text .= $_;
+        $text .= "\$(OUTPUTDIR)\\" . $_;

         s/\.obj$//;
         $text .= ':     $(COMMDIR)\\';
         my $suffix, $cc;
         if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) {
             $suffix = "c";
             $cc="CC";
         s/\.obj$//;
         $text .= ':     $(COMMDIR)\\';
         my $suffix, $cc;
         if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) {
             $suffix = "c";
             $cc="CC";

+            $flags="CFLAGS";

         }
         else {
             $suffix = "cpp";
         }
         else {
             $suffix = "cpp";

-            $cc="CCC";
+            $cc="CXX";
+            $flags="CXXFLAGS";

         }
         $text .= $_ . ".$suffix\n" .
         }
         $text .= $_ . ".$suffix\n" .

-                 "  *\$($cc) \$(CPPFLAGS) \$(IFLAGS) \$<" . "\n\n";
+                 "  *\$($cc) \$($flags) \$<" . "\n\n";

     }
 #$}
 
     }
 #$}
 

-y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
-
-#  *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS $(COMMDIR)\y_tab.c
-
-$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
-        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
-
-$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
-    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c

 
 ########################################################
 # Generic objects (not always compiled, depending on
 
 ########################################################
 # Generic objects (not always compiled, depending on


@@ -198,62 +193,29 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     $_ = $project{"WXGENERICOBJS"};
     my @objs = split;
     foreach (@objs) {
     $_ = $project{"WXGENERICOBJS"};
     my @objs = split;
     foreach (@objs) {

-        $text .= $_;
+        $text .= "\$(OUTPUTDIR)\\" . $_;

         s/\.obj$//;
         $text .= ':     $(GENDIR)\\';
         $text .= $_ . ".cpp\n" .
         s/\.obj$//;
         $text .= ':     $(GENDIR)\\';
         $text .= $_ . ".cpp\n" .

-                 '  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<' . "\n\n";
+                 '  *$(CXX) $(CXXFLAGS) $<' . "\n\n";

     }
 #$}
 
     }
 #$}
 

-OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
-  trees$(O)
-OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
-  infutil$(O) inffast$(O)
-
-adler32.obj: adler32.c zutil.h zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c
-
-compress.obj: compress.c zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c
-
-crc32.obj: crc32.c zutil.h zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c

 
 

-gzio.obj: gzio.c zutil.h zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c
-
-infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
-   infcodes.h infutil.h
-       $(CC) -c $(CFLAGS) $*.c
-
-infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
-   infcodes.h inffast.h
-       $(CC) -c $(CFLAGS) $*.c
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
-       $(CC) -c $(CFLAGS) $*.c
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-       $(CC) -c $(CFLAGS) $*.c
-
-infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
-       $(CC) -c $(CFLAGS) $*.c
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
-       $(CC) -c $(CFLAGS) $*.c
-
-trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c
+########################################################
+# HTML objects (always compiled)

 
 

-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-       $(CC) -c $(CFLAGS) $*.c
+#${
+    $_ = $project{"WXHTMLOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        $text .= "\$(OUTPUTDIR)\\" . $_;
+        s/\.obj$//;
+        $text .= ':     $(HTMLDIR)\\';
+        $text .= $_ . ".cpp\n" .
+                 '  *$(CXX) $(CXXFLAGS) $<' . "\n\n";
+    }
+#$}

 
 png:   .SYMBOLIC
     cd $(WXDIR)\src\png
 
 png:   .SYMBOLIC
     cd $(WXDIR)\src\png


@@ -295,6 +257,16 @@ clean_tiff:   .SYMBOLIC
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 

+regex:    .SYMBOLIC
+    cd $(WXDIR)\src\regex
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_regex:   .SYMBOLIC
+    cd $(WXDIR)\src\regex
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+

 MFTYPE=wat
 self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
        cd $(WXDIR)\distrib\msw\tmake
 MFTYPE=wat
 self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
        cd $(WXDIR)\distrib\msw\tmake