backported fix for proper tree ctrl refershing after changing item colour/font from 2.2

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

diff --git a/distrib/msw/tmake/dos.t b/distrib/msw/tmake/dos.t
index 54d017f04799c8129cae435a0ccaba9b011e63fd..cd39f8e555339e285d492a2474e23b91d800b14b 100644 (file)
--- a/distrib/msw/tmake/dos.t
+++ b/distrib/msw/tmake/dos.t
@@ -6,7 +6,6 @@
 #! Created: 14.07.99
 #! Version: $Id$
 #!#############################################################################
-
 #${
     #! include the code which parses filelist.txt file and initializes
     #! %wxCommon, %wxGeneric and %wxMSW hashes.
@@ -15,7 +14,7 @@
     #! now transform these hashes into $project tags
     foreach $file (sort keys %wxGeneric) {
         if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) {
-            #! this file for some reason wasn't compiled for VC++ 1.52
+            #! Need this file too since it has wxGenericPageSetupDialog
             next unless $file =~ /^prntdlgg\./;
         }
 
@@ -23,6 +22,9 @@
         $project{"WXGENERICOBJS"} .= "\$(GENDIR)\\" . $file . " "
     }
 
+    #! because we later search for " <filename> " in this string
+    $project{"WXCOBJS"} = " ";
+
     foreach $file (sort keys %wxCommon) {
         #! socket files don't compile under Win16 currently
         next if $wxCommon{$file} =~ /\b(32|S)\b/;
@@ -30,7 +32,9 @@
         $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
         $obj = "\$(COMMDIR)\\" . $file . " ";
-        $project{"WXCOMMONOBJS"} .= $obj;
+        #! $project{"WXCOMMONOBJS"} .= $obj;
+        #! have to split lib in 2 halves because otherwise it's too big
+        $project{$file =~ "^[a-o]" ? "WXCOMMONOBJS1" : "WXCOMMONOBJS2"} .= $obj;
         $project{"WXCOBJS"} .= $obj if $isCFile;
     }
 
@@ -38,11 +42,14 @@
         #! don't take files not appropriate for 16-bit Windows
         next if $wxMSW{$file} =~ /\b(32|O)\b/;
 
+        $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
-        $project{"WXMSWOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+        $obj = "\$(MSWDIR)\\" . $file . " ";
+        #! have to split lib in 2 halves because otherwise it's too big
+        $project{$file =~ "^[a-o]" ? "WXMSWOBJS1" : "WXMSWOBJS2"} .= $obj;
+        $project{"WXCOBJS"} .= $obj if $isCFile;
     }
 #$}
-
 # This file was automatically generated by tmake at #$ Now()
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
@@ -71,12 +78,10 @@ DUMMYOBJ=dummy.obj
 # This one overrides the others, to be consistent with the settings in wx_setup.h
 MINIMAL_WXWINDOWS_SETUP=0
 
-USE_XPM_IN_MSW=0
 USE_CTL3D=1
 
 !if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"
 USE_CTL3D=0
-USE_XPM_IN_MSW=0
 !endif
 
 PERIPH_LIBS=
@@ -87,12 +92,6 @@ PERIPH_CLEAN_TARGET=
 # PERIPH_LIBS=d:\msdev\lib\ctl3d32.lib $(PERIPH_LIBS)
 # !endif
 
-!if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXDIR)\contrib\wxxpm\xpm.lib $(PERIPH_LIBS)
-PERIPH_TARGET=xpm $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
-!endif
-
 # PNG and Zlib
 PERIPH_TARGET=png zlib $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_png clean_zlib $(PERIPH_CLEAN_TARGET)
@@ -104,56 +103,69 @@ MSWDIR=.
 
 GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
 
-COMMONOBJS = \
+# we can't have all objects in one list because the library becomes too big
+COMMONOBJS1 = \
                $(COMMDIR)\y_tab.obj \
-               #$ ExpandList("WXCOMMONOBJS");
+               #$ ExpandList("WXCOMMONOBJS1");
 
-MSWOBJS = #$ ExpandList("WXMSWOBJS");
+COMMONOBJS2 = \
+               #$ ExpandList("WXCOMMONOBJS2");
 
-# TODO: Implement XPM and PNG targets in this makefile!
-#  $(OLEDIR)\xpmhand \
-#  $(OLEDIR)\pnghand \
+# we can't have all objects in one list because the library becomes too big
+MSWOBJS1 = #$ ExpandList("WXMSWOBJS1");
 
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+MSWOBJS2 = #$ ExpandList("WXMSWOBJS2");
+
+OBJECTS = $(COMMONOBJS1) $(COMMONOBJS2) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
 
 # Normal, static library
-all:    $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib
+all:    $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib $(WXDIR)\lib\wx5.lib
 
-$(WXDIR)\lib\wx1.lib:      $(COMMONOBJS) $(PERIPH_LIBS)
+$(WXDIR)\lib\wx1.lib:      $(COMMONOBJS1) $(PERIPH_LIBS)
        -erase $(WXDIR)\lib\wx1.lib
        lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx1.lib
 y
-$(COMMONOBJS) $(PERIPH_LIBS)
+$(COMMONOBJS1) $(PERIPH_LIBS)
 nul
 ;
 <<
 
-$(WXDIR)\lib\wx2.lib:      $(GENERICOBJS)
+$(WXDIR)\lib\wx2.lib:      $(COMMONOBJS2)
        -erase $(WXDIR)\lib\wx2.lib
        lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx2.lib
 y
-$(GENERICOBJS)
+$(COMMONOBJS2)
 nul
 ;
 <<
 
-$(WXDIR)\lib\wx3.lib:      $(MSWOBJS1)
+$(WXDIR)\lib\wx3.lib:      $(GENERICOBJS)
        -erase $(WXDIR)\lib\wx3.lib
        lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx3.lib
 y
-$(MSWOBJS1)
+$(GENERICOBJS)
 nul
 ;
 <<
 
-$(WXDIR)\lib\wx4.lib:      $(MSWOBJS2)
+$(WXDIR)\lib\wx4.lib:      $(MSWOBJS1)
        -erase $(WXDIR)\lib\wx4.lib
        lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx4.lib
 y
+$(MSWOBJS1)
+nul
+;
+<<
+
+$(WXDIR)\lib\wx5.lib:      $(MSWOBJS2)
+       -erase $(WXDIR)\lib\wx5.lib
+       lib /PAGESIZE:128 @<<
+$(WXDIR)\lib\wx5.lib
+y
 $(MSWOBJS2)
 nul
 ;
@@ -176,23 +188,23 @@ $(CPPFLAGS) /YcWX/WXPREC.H /c /Tp $*.$(SRCSUFF)
 <<
 
 #${
-    $_ = $project{"WXMSWOBJS"} . $project{"WXCOMMONOBJS"} . $project{"WXGENERICOBJS"};
+    $_ = $project{"WXMSWOBJS1"} . $project{"WXMSWOBJS2"} . $project{"WXCOMMONOBJS1"} . $project{"WXCOMMONOBJS2"} . $project{"WXGENERICOBJS"};
     my @objs = split;
     foreach (@objs) {
-       if ( $project{"WXCOBJS"} =~ /\Q$_/ ) {
-               s:\\:/:;
-               $text .= $_ . ':     $*.c' . "\n" .
-                        '        cl @<<' . "\n" .
-                        '$(CPPFLAGS2) /Fo$@ /c /Tc $*.c' . "\n" .
-                        "<<\n\n";
-       }
-       else {
-               s:\\:/:;
-               $text .= $_ . ':     $*.$(SRCSUFF)' . "\n" .
-                        '        cl @<<' . "\n" .
-                        '$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)' . "\n" .
-                        "<<\n\n";
-       }
+        if ( $project{"WXCOBJS"} =~ / \Q$_\E / ) {
+            s:\\:/:;
+            $text .= $_ . ':     $*.c' . "\n" .
+                 '        cl @<<' . "\n" .
+                 '$(CPPFLAGS2) /Fo$@ /c /Tc $*.c' . "\n" .
+                 "<<\n\n";
+        }
+        else {
+            s:\\:/:;
+            $text .= $_ . ':     $*.$(SRCSUFF)' . "\n" .
+                 '        cl @<<' . "\n" .
+                 '$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)' . "\n" .
+                 "<<\n\n";
+        }
     }
 #$}
 
@@ -211,16 +223,6 @@ $(OBJECTS):        $(WXDIR)/include/wx/setup.h
 
 # Peripheral components
 
-xpm:
-    cd $(WXDIR)\src\xpm
-    nmake -f makefile.dos FINAL=$(FINAL)
-    cd $(WXDIR)\src\msw
-
-clean_xpm:
-    cd $(WXDIR)\src\xpm
-    nmake -f makefile.dos clean
-    cd $(WXDIR)\src\msw
-
 zlib:
     cd $(WXDIR)\src\zlib
     nmake -f makefile.dos FINAL=$(FINAL)