Added x11.t, changes to other config files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/filelist.t b/distrib/msw/tmake/filelist.t
index f3ff62ac4a7d17157ddec1010183e21cfc9c4461..15f8c340b0b970ab8d4ac996a87d4029e1753705 100644 (file)
--- a/distrib/msw/tmake/filelist.t
+++ b/distrib/msw/tmake/filelist.t
@@ -48,6 +48,7 @@
         $fileflags =~ s/Socket/S/;
         $fileflags =~ s/NotMSW/U/;
         $fileflags =~ s/NotGTK/R/;
+        $fileflags =~ s/NotX11/X11/;
         $fileflags =~ s/NotX/X/;
         $fileflags =~ s/NotOS2/P/;
         $fileflags =~ s/LowLevel/L/;
@@ -72,6 +73,8 @@
             $wxMICRO{$filename} = $fileflags;
         } elsif ( $filetype eq "OS2" ) {
             $wxOS2PM{$filename} = $fileflags;
+        } elsif ( $filetype eq "X11" ) {
+            $wxX11{$filename} = $fileflags;
         } elsif ( $filetype eq "HTML" ) {
             $wxHTML{$filename} = $fileflags;
         } elsif ( $filetype eq "Unix" ) {
@@ -96,6 +99,8 @@
             $wxGTKINCLUDE{$filename} = $fileflags;
         } elsif ( $filetype eq "OS2H" ) {
             $wxOS2PMINCLUDE{$filename} = $fileflags;
+        } elsif ( $filetype eq "X11H" ) {
+            $wxX11INCLUDE{$filename} = $fileflags;
         } elsif ( $filetype eq "UnivH" ) {
             $wxUNIVINCLUDE{$filename} = $fileflags;
         } elsif ( $filetype eq "UnixH" ) {

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index e79aa8f8aa8aaa5a73a6b3fdfd52e1f59e641ea1..cf4c9f99424f8b3eb2f6ca71c543005824bc1f9a 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -19,6 +19,7 @@
 #  MGL /src/mgl
 #  Micro       /src/msw for MicroWindows
 #  OS2 /src/os2
+#  X11 /src/x11
 #  HTML        /src/html
 #
 # 'H' suffix means these are headers, not .cpp files
@@ -29,6 +30,7 @@
 #  MotifH      /include/wx/motif
 #  MSWH        /include/wx/msw
 #  OS2H        /include/wx/os2
+#  X11H        /include/wx/x11
 #  GenericH    /include/wx/generic
 #  HtmlH       /include/wx/html
 #  ProtoH      /include/wx/protocol
@@ -56,6 +58,7 @@
 #  NotMicro    Not required for the MicroWindows port
 #  NotGTK      Not required for the GTK port
 #  NotX        Not required for the Motif port
+#  NotX11      Not required for the X11 port
 #  NotOS2      Not required for the os2Pm port
 #  NotUniv     Not required for the wxUniversal
 #  LowLevel    Low level GUI toolkit file, used by wxUniversal as well
@@ -597,6 +600,37 @@ timer.cpp  Motif
 utils.cpp      Motif
 window.cpp     Motif
 
+gsockx11.c     X11     Socket
+accel.cpp      X11
+app.cpp        X11
+bitmap.cpp     X11
+brush.cpp      X11
+clipbrd.cpp    X11
+colour.cpp     X11
+cursor.cpp     X11
+data.cpp       X11
+dataobj.cpp    X11
+dc.cpp X11
+dcclient.cpp   X11
+dcmemory.cpp   X11
+dcscreen.cpp   X11
+font.cpp       X11
+gdiobj.cpp     X11
+glcanvas.cpp   X11
+icon.cpp       X11
+joystick.cpp   X11
+main.cpp       X11
+minifram.cpp   X11
+palette.cpp    X11
+pen.cpp        X11
+region.cpp     X11
+settings.cpp   X11
+toolbar.cpp    X11
+toplevel.cpp   X11
+timer.cpp      X11
+utils.cpp      X11
+window.cpp     X11
+
 accel.cpp      OS2
 app.cpp        OS2
 bitmap.cpp     OS2
@@ -1119,7 +1153,6 @@ minifram.h        MotifH
 msgdlg.h       MotifH
 palette.h      MotifH
 pen.h  MotifH
-helpbest.h     MSWH
 print.h        MotifH
 printdlg.h     MotifH
 private.h      MotifH
@@ -1138,6 +1171,38 @@ timer.h  MotifH
 toolbar.h      MotifH
 window.h       MotifH
 
+accel.h        X11H
+app.h  X11H
+bitmap.h       X11H
+brush.h        X11H
+clipbrd.h      X11H
+colour.h       X11H
+cursor.h       X11H
+dataform.h     X11H
+dataobj.h      X11H
+dc.h   X11H
+dcclient.h     X11H
+dcmemory.h     X11H
+dcprint.h      X11H
+dcscreen.h     X11H
+dnd.h  X11H
+font.h X11H
+gdiobj.h       X11H
+glcanvas.h     X11H
+icon.h X11H
+joystick.h     X11H
+minifram.h     X11H
+palette.h      X11H
+pen.h  X11H
+print.h        X11H
+private.h      X11H
+region.h       X11H
+settings.h     X11H
+timer.h        X11H
+toolbar.h      X11H
+toplevel.h     X11H
+window.h       X11H
+
 accel.h        MSWH
 app.h  MSWH
 bitmap.h       MSWH
@@ -1179,6 +1244,7 @@ gccpriv.h MSWH
 gdiimage.h     MSWH
 gdiobj.h       MSWH
 glcanvas.h     MSWH
+helpbest.h     MSWH
 helpchm.h      MSWH
 helpwin.h      MSWH
 icon.h MSWH
@@ -1388,7 +1454,7 @@ laywin.h  GenericH
 listctrl.h     GenericH        NotWin32
 msgdlgg.h      GenericH
 notebook.h     GenericH
-paletteg.h     GenericH        NotMSW,NotX,NotOS2
+paletteg.h     GenericH        NotMSW,NotX,NotX11,NotOS2
 panelg.h       GenericH
 printps.h      GenericH
 prntdlgg.h     GenericH

diff --git a/distrib/msw/tmake/x11.t b/distrib/msw/tmake/x11.t
new file mode 100644 (file)
index 0000000..0e4bcfa
--- /dev/null
+++ b/distrib/msw/tmake/x11.t
@@ -0,0 +1,105 @@
+#!################################################################################
+#! File:    x11.t
+#! Purpose: tmake template file from which src/x11/files.lst containing the
+#!          list of files for wxMotif library is generated by tmake
+#! Author:  Vadim Zeitlin
+#! Created: 28.01.00
+#! Version: $Id$
+#!################################################################################
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric, %wxHtml, %wxUNIX, %wxMOTIF, %wxX11 and
+    #! %wxOS2PM hashes.
+    IncludeTemplate("filelist.t");
+
+    #! find all our sources
+    $project{"COMMONOBJS"} .= "parser.o ";
+
+    foreach $file (sort keys %wxGeneric) {
+        next if $wxGeneric{$file} =~ /\bX\b/;
+
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+
+        $project{"X11_SOURCES"} .= "generic/" . $file . " ";
+        $project{"GENERICOBJS"} .= $fileobj . " ";
+    }
+
+    foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\bX\b/;
+
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+
+        $project{"X11_SOURCES"} .= "common/" . $file . " ";
+        $project{"COMMONOBJS"} .= $fileobj . " ";
+    }
+
+    foreach $file (sort keys %wxX11) {
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+
+        $project{"X11_SOURCES"} .= "x11f/" . $file . " ";
+        $project{"GUIOBJS"} .= $fileobj . " ";
+    }
+
+    foreach $file (sort keys %wxUNIX) {
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+
+        $project{"X11_SOURCES"} .= "unix/" . $file . " ";
+        $project{"UNIXOBJS"} .= $fileobj . " ";
+    }
+
+    foreach $file (sort keys %wxHTML) {
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+
+        $project{"X11_SOURCES"} .= "html/" . $file . " ";
+        $project{"HTMLOBJS"} .= $fileobj . " ";
+    }
+    #! find all our headers
+    foreach $file (sort keys %wxWXINCLUDE) {
+        next if $wxWXINCLUDE{$file} =~ /\bX\b/;
+
+        $project{"X11_HEADERS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxX11INCLUDE) {
+        $project{"X11_HEADERS"} .= "x11/" . $file . " "
+    }
+
+    foreach $file (sort keys %wxGENERICINCLUDE) {
+        $project{"X11_HEADERS"} .= "generic/" . $file . " "
+    }
+
+    foreach $file (sort keys %wxUNIXINCLUDE) {
+        $project{"X11_HEADERS"} .= "unix/" . $file . " "
+    }
+
+    foreach $file (sort keys %wxHTMLINCLUDE) {
+        $project{"X11_HEADERS"} .= "html/" . $file . " "
+    }
+
+    foreach $file (sort keys %wxPROTOCOLINCLUDE) {
+        $project{"X11_HEADERS"} .= "protocol/" . $file . " "
+    }
+#$}
+# This file was automatically generated by tmake 
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
+ALL_SOURCES = \
+               #$ ExpandList("X11_SOURCES");
+
+ALL_HEADERS = \
+               #$ ExpandList("X11_HEADERS");
+
+COMMONOBJS = \
+               #$ ExpandList("COMMONOBJS");
+
+GENERICOBJS = \
+               #$ ExpandList("GENERICOBJS");
+
+GUIOBJS = \
+               #$ ExpandList("GUIOBJS");
+
+UNIXOBJS = \
+               #$ ExpandList("UNIXOBJS");
+
+HTMLOBJS = \
+               #$ ExpandList("HTMLOBJS");
+