fixed (didn't work at all)

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

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index d63783965c825a09f1eadee179b977718b9c907b..f6aa42cb3f50524816d1dab7213e24bb6566e464 100644 (file)
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -15,30 +15,39 @@
     #! now transform these hashes into $project tags
     foreach $file (sort keys %wxGeneric) {
         my $tag = "";
     #! now transform these hashes into $project tags
     foreach $file (sort keys %wxGeneric) {
         my $tag = "";

-        if ( $wxGeneric{$file} =~ /\b(G|16|U)\b/ ) {
-            next;
-        }
+        next if $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/;

 
         $file =~ s/cp?p?$/obj/;
         $project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " "
     }
 
     foreach $file (sort keys %wxCommon) {
 
         $file =~ s/cp?p?$/obj/;
         $project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " "
     }
 
     foreach $file (sort keys %wxCommon) {

+        $isCFile = $file =~ /\.c$/;

         $file =~ s/cp?p?$/obj/;
         $file =~ s/cp?p?$/obj/;

-        $project{"WXCOMMONOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+        $obj = "\$(MSWDIR)\\" . $file . " ";
+        $project{"WXCOMMONOBJS"} .= $obj;
+        $project{"WXCOBJS"} .= $obj if $isCFile;

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

-        if ( file =~ /automtn/ ) {
+        if ( $file =~ /^automtn/ ) {

             #! comment in old makefile.b32 seems to imply that this file can't
             #! be compiled with Borland (leads to crash in oleauto sample)
             next;
         }
 
             #! comment in old makefile.b32 seems to imply that this file can't
             #! be compiled with Borland (leads to crash in oleauto sample)
             next;
         }
 

+        my $isOleObj = $wxMSW{$file} =~ /\bO\b/;

         $file =~ s/cp?p?$/obj/;
         $file =~ s/cp?p?$/obj/;

-        $project{"WXMSWOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+        my $obj = "\$(MSWDIR)\\" . $file . " ";
+
+        $project{"WXMSWOBJS"} .= $obj;
+        if ( $isOleObj ) {
+            #! remember that this file is in ole subdir
+            $project{"WXOLEOBJS"} .= $obj;
+        }
+

     }
 #$}
 
     }
 #$}
 


@@ -149,7 +158,7 @@ all:        all_libs all_execs
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         -erase $(LIBTARGET)
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         -erase $(LIBTARGET)

-       tlib $(LIBTARGET) /P512 @&&!
+       tlib $(LIBTARGET) /P1024 @&&!

 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 
 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 


@@ -191,6 +200,7 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     my @objs = split;
     foreach (@objs) {
         $text .= $_ . ": ";
     my @objs = split;
     foreach (@objs) {
         $text .= $_ . ": ";

+        if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; }

         s/obj$/\$(SRCSUFF)/;
         $text .= $_ . "\n\n";
     }
         s/obj$/\$(SRCSUFF)/;
         $text .= $_ . "\n\n";
     }


@@ -204,8 +214,9 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     my @objs = split;
     foreach (@objs) {
         $text .= $_ . ": ";
     my @objs = split;
     foreach (@objs) {
         $text .= $_ . ": ";

+        $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';

         s/MSWDIR/COMMDIR/;
         s/MSWDIR/COMMDIR/;

-        s/obj$/\$(SRCSUFF)/;
+        s/obj$/$suffix/;

         $text .= $_ . "\n\n";
     }
 #$}
         $text .= $_ . "\n\n";
     }
 #$}


@@ -253,7 +264,7 @@ clean_wxxpm:        $(CFG)
 
 png:    $(CFG)
         cd $(WXDIR)\src\png
 
 png:    $(CFG)
         cd $(WXDIR)\src\png

-        make -f makefile.b32 
+        make -f makefile.b32

         cd $(WXDIR)\src\msw
 
 clean_png:
         cd $(WXDIR)\src\msw
 
 clean_png:


@@ -273,7 +284,7 @@ clean_zlib:
 
 jpeg:    $(CFG)
         cd $(WXDIR)\src\jpeg
 
 jpeg:    $(CFG)
         cd $(WXDIR)\src\jpeg

-        make -f makefile.b32 
+        make -f makefile.b32

         cd $(WXDIR)\src\msw
 
 clean_jpeg:
         cd $(WXDIR)\src\msw
 
 clean_jpeg:


@@ -322,3 +333,9 @@ clean: $(PERIPH_CLEAN_TARGET)
 cleanall: clean
 
 
 cleanall: clean
 
 

+MFTYPE=b32
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+       cd $(WXWIN)\distrib\msw\tmake
+       tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+       copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+