cleaning up the mess created by the FloodFill patch

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

diff --git a/distrib/msw/tmake/dos.t b/distrib/msw/tmake/dos.t
index f3e30fb933c8d4f1a3c2c4a83e0f5e0cdfe0e1b5..0a09de711c7de0e1b723bc15e1d085967dc2526b 100644 (file)
--- a/distrib/msw/tmake/dos.t
+++ b/distrib/msw/tmake/dos.t
@@ -14,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\./;
         }
 
@@ -32,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;
     }
 
@@ -48,7 +50,7 @@
         $project{"WXCOBJS"} .= $obj if $isCFile;
     }
 #$}
-# 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 DOS.T!
 
 #
@@ -76,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=
@@ -92,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)
@@ -109,59 +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");
+
+COMMONOBJS2 = \
+               #$ ExpandList("WXCOMMONOBJS2");
 
 # we can't have all objects in one list because the library becomes too big
 MSWOBJS1 = #$ ExpandList("WXMSWOBJS1");
 
 MSWOBJS2 = #$ ExpandList("WXMSWOBJS2");
 
-# TODO: Implement XPM and PNG targets in this makefile!
-#  $(OLEDIR)\xpmhand \
-#  $(OLEDIR)\pnghand \
-
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
+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
 ;
@@ -184,7 +188,7 @@ $(CPPFLAGS) /YcWX/WXPREC.H /c /Tp $*.$(SRCSUFF)
 <<
 
 #${
-    $_ = $project{"WXMSWOBJS1"} . $project{"WXMSWOBJS2"} . $project{"WXCOMMONOBJS"} . $project{"WXGENERICOBJS"};
+    $_ = $project{"WXMSWOBJS1"} . $project{"WXMSWOBJS2"} . $project{"WXCOMMONOBJS1"} . $project{"WXCOMMONOBJS2"} . $project{"WXGENERICOBJS"};
     my @objs = split;
     foreach (@objs) {
         if ( $project{"WXCOBJS"} =~ / \Q$_\E / ) {
@@ -219,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)