(Hopefully) fixed bad MSW makefiles (Vadim, can you please check if I haven't screw up something in that executable noise?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -29,6 +29,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
foreach $file (sort keys %wxCommon) {
|
foreach $file (sort keys %wxCommon) {
|
||||||
|
next if $wxCommon{$file} =~ /\b(16|U)\b/;
|
||||||
|
|
||||||
$isCFile = $file =~ /\.c$/;
|
$isCFile = $file =~ /\.c$/;
|
||||||
$file =~ s/cp?p?$/obj/;
|
$file =~ s/cp?p?$/obj/;
|
||||||
$obj = "\$(MSWDIR)\\" . $file . " ";
|
$obj = "\$(MSWDIR)\\" . $file . " ";
|
||||||
|
@@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
foreach $file (sort keys %wxCommon) {
|
foreach $file (sort keys %wxCommon) {
|
||||||
#! socket files don't compile under Win16 currently
|
#! socket files don't compile under Win16 currently
|
||||||
next if $wxCommon{$file} =~ /\b(32|S)\b/;
|
next if $wxCommon{$file} =~ /\b(32|S|U)\b/;
|
||||||
|
|
||||||
#! needs extra files (sql*.h) so not compiled by default.
|
#! needs extra files (sql*.h) so not compiled by default.
|
||||||
next if $file =~ /^odbc\./;
|
next if $file =~ /^odbc\./;
|
||||||
|
@@ -24,7 +24,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
foreach $file (sort keys %wxCommon) {
|
foreach $file (sort keys %wxCommon) {
|
||||||
next if $wxCommon{$file} =~ /\b(16)\b/;
|
next if $wxCommon{$file} =~ /\b(16|U)\b/;
|
||||||
|
|
||||||
#! needs extra files (sql*.h) so not compiled by default.
|
#! needs extra files (sql*.h) so not compiled by default.
|
||||||
#! next if $file =~ /^odbc\./;
|
#! next if $file =~ /^odbc\./;
|
||||||
|
@@ -25,7 +25,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
foreach $file (sort keys %wxCommon) {
|
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/;
|
($fileobj = $file) =~ s/cp?p?$/\o/;
|
||||||
|
|
||||||
|
@@ -27,6 +27,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
foreach $file (sort keys %wxCommon) {
|
foreach $file (sort keys %wxCommon) {
|
||||||
|
next if $wxCommon{$file} =~ /\b(16|U)\b/;
|
||||||
|
|
||||||
$file =~ s/cp?p?$/obj/;
|
$file =~ s/cp?p?$/obj/;
|
||||||
$project{"WXCOMMONOBJS"} .= '$(COMMDIR)\\' . $file . " "
|
$project{"WXCOMMONOBJS"} .= '$(COMMDIR)\\' . $file . " "
|
||||||
}
|
}
|
||||||
|
@@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
foreach $file (sort keys %wxCommon) {
|
foreach $file (sort keys %wxCommon) {
|
||||||
#! socket files don't compile under Win16 currently
|
#! socket files don't compile under Win16 currently
|
||||||
next if $wxCommon{$file} =~ /\b(32|S)\b/;
|
next if $wxCommon{$file} =~ /\b(32|S|U)\b/;
|
||||||
|
|
||||||
$isCFile = $file =~ /\.c$/;
|
$isCFile = $file =~ /\.c$/;
|
||||||
$file =~ s/cp?p?$/obj/;
|
$file =~ s/cp?p?$/obj/;
|
||||||
|
@@ -37,6 +37,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
foreach $file (sort keys %wxCommon) {
|
foreach $file (sort keys %wxCommon) {
|
||||||
|
next if $wxCommon{$file} =~ /\b(16|U)\b/;
|
||||||
|
|
||||||
$isCFile = $file =~ /\.c$/;
|
$isCFile = $file =~ /\.c$/;
|
||||||
$file =~ s/cp?p?$/obj/;
|
$file =~ s/cp?p?$/obj/;
|
||||||
$project{"WXCOMMONOBJS"} .= $file . " ";
|
$project{"WXCOMMONOBJS"} .= $file . " ";
|
||||||
|
Reference in New Issue
Block a user