X11 make stuff.

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

diff --git a/distrib/msw/tmake/x11.t b/distrib/msw/tmake/x11.t
index 4036206ddc94846706c07be296058cfd8ac7cadc..3ccb7a11a63e7735ad7a63c5ee72ff1680ff77f1 100644 (file)
--- a/distrib/msw/tmake/x11.t
+++ b/distrib/msw/tmake/x11.t
@@ -15,6 +15,24 @@
     #! find all our sources
     $project{"COMMONOBJS"} .= "parser.o ";
 
     #! find all our sources
     $project{"COMMONOBJS"} .= "parser.o ";
 

+    foreach $file (sort keys %wxX11) {
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+
+        $project{"X11_SOURCES"} .= "x11/" . $file . " ";
+        $project{"GUIOBJS"} .= $fileobj . " ";
+    }
+
+    foreach $file (sort keys %wxUNIV) {
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+
+        if ( $wxUNIV{$file} =~ /Theme/ ) {
+            $file = "themes/" . $file
+        }
+
+        $project{"X11_SOURCES"} .= "univ/" . $file . " ";
+        $project{"GUIOBJS"} .= $fileobj . " ";
+    }
+

     foreach $file (sort keys %wxGeneric) {
         next if $wxGeneric{$file} =~ /\bNotX11\b/;
 
     foreach $file (sort keys %wxGeneric) {
         next if $wxGeneric{$file} =~ /\bNotX11\b/;
 


@@ -33,13 +51,6 @@
         $project{"COMMONOBJS"} .= $fileobj . " ";
     }
 
         $project{"COMMONOBJS"} .= $fileobj . " ";
     }
 

-    foreach $file (sort keys %wxX11) {
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-
-        $project{"X11_SOURCES"} .= "x11/" . $file . " ";
-        $project{"GUI_LOWLEVEL_OBJS"} .= $fileobj . " ";
-    }
-

     foreach $file (sort keys %wxUNIX) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
     foreach $file (sort keys %wxUNIX) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 


@@ -64,6 +75,10 @@
         $project{"X11_HEADERS"} .= "x11/" . $file . " "
     }
 
         $project{"X11_HEADERS"} .= "x11/" . $file . " "
     }
 

+    foreach $file (sort keys %wxUNIVINCLUDE) {
+        $project{"X11_HEADERS"} .= "univ/" . $file . " ";
+    }
+

     foreach $file (sort keys %wxGENERICINCLUDE) {
         $project{"X11_HEADERS"} .= "generic/" . $file . " "
     }
     foreach $file (sort keys %wxGENERICINCLUDE) {
         $project{"X11_HEADERS"} .= "generic/" . $file . " "
     }


@@ -88,15 +103,15 @@ ALL_SOURCES = \
 ALL_HEADERS = \
                #$ ExpandList("X11_HEADERS");
 
 ALL_HEADERS = \
                #$ ExpandList("X11_HEADERS");
 

+GUIOBJS = \
+               #$ ExpandList("GUIOBJS");
+

 COMMONOBJS = \
                #$ ExpandList("COMMONOBJS");
 
 GENERICOBJS = \
                #$ ExpandList("GENERICOBJS");
 
 COMMONOBJS = \
                #$ ExpandList("COMMONOBJS");
 
 GENERICOBJS = \
                #$ ExpandList("GENERICOBJS");
 

-GUI_LOWLEVEL_OBJS = \
-               #$ ExpandList("GUI_LOWLEVEL_OBJS");
-

 UNIXOBJS = \
                #$ ExpandList("UNIXOBJS");
 
 UNIXOBJS = \
                #$ ExpandList("UNIXOBJS");
 

diff --git a/src/x11/files.lst b/src/x11/files.lst
index a63840e4a935f0b0f6ed604ff7dfbbc873c9a973..d8cedb5f096ee4c6c6f4aacb8b027bf442c4f342 100644 (file)
--- a/src/x11/files.lst
+++ b/src/x11/files.lst
@@ -1,6 +1,70 @@
 # This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE X11.T!
 ALL_SOURCES = \
 # This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE X11.T!
 ALL_SOURCES = \

+               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/evtloop.cpp \
+               x11/gdiobj.cpp \
+               x11/glcanvas.cpp \
+               x11/gsockx11.c \
+               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/timer.cpp \
+               x11/toolbar.cpp \
+               x11/toplevel.cpp \
+               x11/utils.cpp \
+               x11/window.cpp \
+               univ/bmpbuttn.cpp \
+               univ/button.cpp \
+               univ/checkbox.cpp \
+               univ/checklst.cpp \
+               univ/choice.cpp \
+               univ/colschem.cpp \
+               univ/combobox.cpp \
+               univ/control.cpp \
+               univ/dialog.cpp \
+               univ/framuniv.cpp \
+               univ/gauge.cpp \
+               univ/themes/gtk.cpp \
+               univ/inpcons.cpp \
+               univ/inphand.cpp \
+               univ/listbox.cpp \
+               univ/menu.cpp \
+               univ/notebook.cpp \
+               univ/radiobox.cpp \
+               univ/radiobut.cpp \
+               univ/renderer.cpp \
+               univ/scrarrow.cpp \
+               univ/scrolbar.cpp \
+               univ/scrthumb.cpp \
+               univ/slider.cpp \
+               univ/spinbutt.cpp \
+               univ/statbmp.cpp \
+               univ/statbox.cpp \
+               univ/statline.cpp \
+               univ/stattext.cpp \
+               univ/statusbr.cpp \
+               univ/textctrl.cpp \
+               univ/theme.cpp \
+               univ/topluniv.cpp \
+               univ/themes/win32.cpp \
+               univ/winuniv.cpp \

                generic/accel.cpp \
                generic/busyinfo.cpp \
                generic/calctrl.cpp \
                generic/accel.cpp \
                generic/busyinfo.cpp \
                generic/calctrl.cpp \


@@ -170,35 +234,6 @@ ALL_SOURCES = \
                common/xpmdecod.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \
                common/xpmdecod.cpp \
                common/zipstrm.cpp \
                common/zstream.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/evtloop.cpp \
-               x11/gdiobj.cpp \
-               x11/glcanvas.cpp \
-               x11/gsockx11.c \
-               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/timer.cpp \
-               x11/toolbar.cpp \
-               x11/toplevel.cpp \
-               x11/utils.cpp \
-               x11/window.cpp \

                unix/dialup.cpp \
                unix/dir.cpp \
                unix/fontenum.cpp \
                unix/dialup.cpp \
                unix/dir.cpp \
                unix/fontenum.cpp \


@@ -491,6 +526,42 @@ ALL_HEADERS = \
                x11/toolbar.h \
                x11/toplevel.h \
                x11/window.h \
                x11/toolbar.h \
                x11/toplevel.h \
                x11/window.h \

+               univ/app.h \
+               univ/bmpbuttn.h \
+               univ/button.h \
+               univ/checkbox.h \
+               univ/checklst.h \
+               univ/choice.h \
+               univ/colschem.h \
+               univ/combobox.h \
+               univ/control.h \
+               univ/frame.h \
+               univ/gauge.h \
+               univ/inpcons.h \
+               univ/inphand.h \
+               univ/listbox.h \
+               univ/menu.h \
+               univ/menuitem.h \
+               univ/notebook.h \
+               univ/radiobox.h \
+               univ/radiobut.h \
+               univ/renderer.h \
+               univ/scrarrow.h \
+               univ/scrolbar.h \
+               univ/scrthumb.h \
+               univ/scrtimer.h \
+               univ/setup.h \
+               univ/slider.h \
+               univ/spinbutt.h \
+               univ/statbmp.h \
+               univ/statbox.h \
+               univ/statline.h \
+               univ/stattext.h \
+               univ/statusbr.h \
+               univ/textctrl.h \
+               univ/theme.h \
+               univ/toplevel.h \
+               univ/window.h \

                generic/accel.h \
                generic/calctrl.h \
                generic/caret.h \
                generic/accel.h \
                generic/calctrl.h \
                generic/caret.h \


@@ -551,6 +622,72 @@ ALL_HEADERS = \
                protocol/http.h \
                protocol/protocol.h
 
                protocol/http.h \
                protocol/protocol.h
 

+GUIOBJS = \
+               app.o \
+               bitmap.o \
+               brush.o \
+               clipbrd.o \
+               colour.o \
+               cursor.o \
+               data.o \
+               dataobj.o \
+               dc.o \
+               dcclient.o \
+               dcmemory.o \
+               dcscreen.o \
+               evtloop.o \
+               gdiobj.o \
+               glcanvas.o \
+               gsockx11.o \
+               icon.o \
+               joystick.o \
+               main.o \
+               minifram.o \
+               palette.o \
+               pen.o \
+               region.o \
+               settings.o \
+               timer.o \
+               toolbar.o \
+               toplevel.o \
+               utils.o \
+               window.o \
+               bmpbuttn.o \
+               button.o \
+               checkbox.o \
+               checklst.o \
+               choice.o \
+               colschem.o \
+               combobox.o \
+               control.o \
+               dialog.o \
+               framuniv.o \
+               gauge.o \
+               gtk.o \
+               inpcons.o \
+               inphand.o \
+               listbox.o \
+               menu.o \
+               notebook.o \
+               radiobox.o \
+               radiobut.o \
+               renderer.o \
+               scrarrow.o \
+               scrolbar.o \
+               scrthumb.o \
+               slider.o \
+               spinbutt.o \
+               statbmp.o \
+               statbox.o \
+               statline.o \
+               stattext.o \
+               statusbr.o \
+               textctrl.o \
+               theme.o \
+               topluniv.o \
+               win32.o \
+               winuniv.o
+

 COMMONOBJS = \
                parser.o \
                appcmn.o \
 COMMONOBJS = \
                parser.o \
                appcmn.o \


@@ -725,37 +862,6 @@ GENERICOBJS = \
                treelay.o \
                wizard.o
 
                treelay.o \
                wizard.o
 

-GUI_LOWLEVEL_OBJS = \
-               app.o \
-               bitmap.o \
-               brush.o \
-               clipbrd.o \
-               colour.o \
-               cursor.o \
-               data.o \
-               dataobj.o \
-               dc.o \
-               dcclient.o \
-               dcmemory.o \
-               dcscreen.o \
-               evtloop.o \
-               gdiobj.o \
-               glcanvas.o \
-               gsockx11.o \
-               icon.o \
-               joystick.o \
-               main.o \
-               minifram.o \
-               palette.o \
-               pen.o \
-               region.o \
-               settings.o \
-               timer.o \
-               toolbar.o \
-               toplevel.o \
-               utils.o \
-               window.o
-

 UNIXOBJS = \
                dialup.o \
                dir.o \
 UNIXOBJS = \
                dialup.o \
                dir.o \