X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b64f0a5fc7bbe365bcd1b38c346a4033761f49ed..40f7145ca55ccf1b197e70acf79bbd4aa5d85145:/distrib/msw/tmake/msw.t diff --git a/distrib/msw/tmake/msw.t b/distrib/msw/tmake/msw.t index 42e56ef40c..cfdd651f73 100644 --- a/distrib/msw/tmake/msw.t +++ b/distrib/msw/tmake/msw.t @@ -14,54 +14,48 @@ #! find all our sources $project{"COMMONOBJS"} .= "parser.o "; - $project{"COMMONDEPS"} .= "parser.d "; foreach $file (sort keys %wxGeneric) { next if $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MSW_SOURCES"} .= "generic/" . $file . " "; $project{"GENERICOBJS"} .= $fileobj . " "; - $project{"GENERICDEPS"} .= $filedep . " " } foreach $file (sort keys %wxCommon) { - next if $wxCommon{$file} =~ /\bR\b/; + next if $wxCommon{$file} =~ /\b(R|U|16)\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MSW_SOURCES"} .= "common/" . $file . " "; $project{"COMMONOBJS"} .= $fileobj . " "; - $project{"COMMONDEPS"} .= $filedep . " " } foreach $file (sort keys %wxMSW) { next if $wxMSW{$file} =~ /\b16\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; if( $wxMSW{$file} =~ /\bO\b/ ) { $project{"MSW_SOURCES"} .= "msw/ole/" . $file . " "; $project{"OLEOBJS"} .= $fileobj . " "; - $project{"OLEDEPS"} .= $filedep . " "; } else { $project{"MSW_SOURCES"} .= "msw/" . $file . " "; $project{"GUIOBJS"} .= $fileobj . " "; - $project{"GUIDEPS"} .= $filedep . " "; + + if ( $wxMSW{$file} =~ /\bL\b/ ) { + $project{"GUI_LOWLEVEL_OBJS"} .= $fileobj . " "; + } } } foreach $file (sort keys %wxHTML) { ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MSW_SOURCES"} .= "html/" . $file . " "; $project{"HTMLOBJS"} .= $fileobj . " "; - $project{"HTMLDEPS"} .= $filedep . " " } #! find all our headers foreach $file (sort keys %wxWXINCLUDE) { @@ -72,6 +66,10 @@ $project{"MSW_HEADERS"} .= "msw/" . $file . " " } + foreach $file (sort keys %wxOLEINCLUDE) { + $project{"MSW_HEADERS"} .= "msw/ole/" . $file . " "; + } + foreach $file (sort keys %wxGENERICINCLUDE) { $project{"MSW_HEADERS"} .= "generic/" . $file . " " } @@ -88,7 +86,7 @@ $project{"MSW_HEADERS"} .= "protocol/" . $file . " " } #$} -# 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 MSW.T! ALL_SOURCES = \ #$ ExpandList("MSW_SOURCES"); @@ -99,41 +97,18 @@ ALL_HEADERS = \ COMMONOBJS = \ #$ ExpandList("COMMONOBJS"); -COMMONDEPS = \ - #$ ExpandList("COMMONDEPS"); - GENERICOBJS = \ #$ ExpandList("GENERICOBJS"); -GENERICDEPS = \ - #$ ExpandList("GENERICDEPS"); - GUIOBJS = \ #$ ExpandList("GUIOBJS"); -GUIDEPS = \ - #$ ExpandList("GUIDEPS"); - -UNIXOBJS = \ - #$ ExpandList("UNIXOBJS"); - -UNIXDEPS = \ - #$ ExpandList("UNIXDEPS"); +GUI_LOWLEVEL_OBJS = \ + #$ ExpandList("GUI_LOWLEVEL_OBJS"); HTMLOBJS = \ #$ ExpandList("HTMLOBJS"); -HTMLDEPS = \ - #$ ExpandList("HTMLDEPS"); - OLEOBJS = \ #$ ExpandList("OLEOBJS"); -OLEDEPS = \ - #$ ExpandList("OLEDEPS"); - -IODBCOBJS = \ - #$ ExpandList("IODBCOBJS"); - -IODBCDEPS = \ - #$ ExpandList("IODBCDEPS");