X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7266b6723573ce6317577226cb1e5d32826e24e8..4d7289e6b077278a1ec050e20d2357cdbfe66897:/distrib/msw/tmake/x11.t diff --git a/distrib/msw/tmake/x11.t b/distrib/msw/tmake/x11.t index 4036206ddc..3ccb7a11a6 100644 --- a/distrib/msw/tmake/x11.t +++ b/distrib/msw/tmake/x11.t @@ -15,6 +15,24 @@ #! 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/; @@ -33,13 +51,6 @@ $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/; @@ -64,6 +75,10 @@ $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 . " " } @@ -88,15 +103,15 @@ ALL_SOURCES = \ ALL_HEADERS = \ #$ ExpandList("X11_HEADERS"); +GUIOBJS = \ + #$ ExpandList("GUIOBJS"); + COMMONOBJS = \ #$ ExpandList("COMMONOBJS"); GENERICOBJS = \ #$ ExpandList("GENERICOBJS"); -GUI_LOWLEVEL_OBJS = \ - #$ ExpandList("GUI_LOWLEVEL_OBJS"); - UNIXOBJS = \ #$ ExpandList("UNIXOBJS");