wxArray<T> macros have been changed to fix runtime problems under 64 bit

[wxWidgets.git] / distrib / msw / tmake / filelist.t

diff --git a/distrib/msw/tmake/filelist.t b/distrib/msw/tmake/filelist.t
index 3ad997b8e7eec1f3dc1c06b870caf2176e452bab..4c1b83f364f66e312d6112bc5c1f09b7ca7c0ac7 100644 (file)
--- a/distrib/msw/tmake/filelist.t
+++ b/distrib/msw/tmake/filelist.t
@@ -19,34 +19,95 @@
         #!     print STDERR "Processing line: '$_'\n";
         #! }
 
         #!     print STDERR "Processing line: '$_'\n";
         #! }
 

-        my @fields = split "\t";
+        my @fields = split /\t/;
+
+        #! first column is filename, second is type, third is flags
+        my ($filename, $filetype, $fileflags) = @fields;
+

         if ( $#fields > 2 ) {
             warn "Ignoring malformed line $_ in the filelist file.\n";
             next line;
         } elsif ( $#fields == 1 ) {
             #! add an empty flags string
         if ( $#fields > 2 ) {
             warn "Ignoring malformed line $_ in the filelist file.\n";
             next line;
         } elsif ( $#fields == 1 ) {
             #! add an empty flags string

-            $fields[2] = "";
+            $fileflags = "";

         }
 
         if ( $verbose ) {
         }
 
         if ( $verbose ) {

-            print STDERR "File $fields[0]: type '$fields[1]', flags '$fields[2]'\n";
+            print STDERR "File $filename: type '$filetype', flags '$fileflags'\n";

         }
 
         }
 

-        #! first column is filename, second is type, third is flags
-        if ( $fields[1] eq "C" ) {
-            $wxCommon{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "G" ) {
-            $wxGeneric{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "M" ) {
-            $wxMSW{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "R" ) {
-            $wxGTK{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "H" ) {
-            $wxHTML{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "U" ) {
-            $wxUNIX{$fields[0]} = $fields[2];
+        #! this is a bit stupid but all templates are written using the old
+        #! single letter flags which became so unreadable that I decided to
+        #! replace them with more readable strings, but it was easier to do
+        #! the translation here instead of changing all *.t files
+        $fileflags =~ s/Base/B/;
+        $fileflags =~ s/NotWin32/16/;
+        $fileflags =~ s/Win32Only/32/;
+        $fileflags =~ s/Generic/G/;
+        $fileflags =~ s/OLE/O/;
+        $fileflags =~ s/Socket/S/;
+        $fileflags =~ s/NotMSW/U/;
+        $fileflags =~ s/NotOS2/P/;
+        $fileflags =~ s/LowLevel/L/;
+
+        if ( $filetype eq "Common" ) {
+            $wxCommon{$filename} = $fileflags;
+        } elsif ( $filetype eq "Generic" ) {
+            $wxGeneric{$filename} = $fileflags;
+        } elsif ( $filetype eq "MSW" ) {
+            $wxMSW{$filename} = $fileflags;
+        } elsif ( $filetype eq "Mac" ) {
+            $wxMAC{$filename} = $fileflags;
+        } elsif ( $filetype eq "Motif" ) {
+            $wxMOTIF{$filename} = $fileflags;
+        } elsif ( $filetype eq "GTK" ) {
+            $wxGTK{$filename} = $fileflags;
+        } elsif ( $filetype eq "Univ" ) {
+            $wxUNIV{$filename} = $fileflags;
+        } elsif ( $filetype eq "MGL" ) {
+            $wxMGL{$filename} = $fileflags;
+        } elsif ( $filetype eq "Micro" ) {
+            $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" ) {
+            $wxUNIX{$filename} = $fileflags;
+        } elsif ( $filetype eq "BaseOnly" ) {
+            $wxBase{$filename} = $fileflags;
+        } elsif ( $filetype eq "WXH" ) {
+            $wxWXINCLUDE{$filename} = $fileflags;
+        } elsif ( $filetype eq "ProtoH" ) {
+            $wxPROTOCOLINCLUDE{$filename} = $fileflags;
+        } elsif ( $filetype eq "HtmlH" ) {
+            $wxHTMLINCLUDE{$filename} = $fileflags;
+        } elsif ( $filetype eq "MacH" ) {
+            $wxMACINCLUDE{$filename} = $fileflags;
+        } elsif ( $filetype eq "MotifH" ) {
+            $wxMOTIFINCLUDE{$filename} = $fileflags;
+        } elsif ( $filetype eq "MSWH" && $fileflags =~ m/O/ ) {
+            $wxOLEINCLUDE{$filename} = $fileflags;
+        } elsif ( $filetype eq "MSWH" ) {
+            $wxMSWINCLUDE{$filename} = $fileflags;
+        } elsif ( $filetype eq "GTKH" ) {
+            $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" ) {
+            $wxUNIXINCLUDE{$filename} = $fileflags;
+        } elsif ( $filetype eq "GenericH" ) {
+            $wxGENERICINCLUDE{$filename} = $fileflags;
+        } elsif ( $filetype eq "MacR" ) {
+            $wxMACRESOURCE{$filename} = $fileflags;

         } else {
         } else {

-            warn "Unknown file type $fields[1] for $fields[0], ignoring.\n";
+            warn "Unknown file type $filetype for $filename, ignoring.\n";

             next line;
         }
     }
             next line;
         }
     }