give focus to show top level windows

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

diff --git a/distrib/msw/tmake/dos.t b/distrib/msw/tmake/dos.t
index 0b92a431af2fc170698cf1cd59359beb4b7e806d..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$
 #!#############################################################################
 #! Created: 14.07.99
 #! Version: $Id$
 #!#############################################################################

-

 #${
     #! include the code which parses filelist.txt file and initializes
     #! %wxCommon, %wxGeneric and %wxMSW hashes.
 #${
     #! 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/ ) {
     #! 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 was compiled for VC++ 1.52
+            #! Need this file too since it has wxGenericPageSetupDialog

             next unless $file =~ /^prntdlgg\./;
         }
 
             next unless $file =~ /^prntdlgg\./;
         }
 


@@ -23,23 +22,34 @@
         $project{"WXGENERICOBJS"} .= "\$(GENDIR)\\" . $file . " "
     }
 
         $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/;
 
     foreach $file (sort keys %wxCommon) {
         #! socket files don't compile under Win16 currently
         next if $wxCommon{$file} =~ /\b(32|S)\b/;
 

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

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

-        $project{"WXCOMMONOBJS"} .= "\$(COMMDIR)\\" . $file . " "
+        $obj = "\$(COMMDIR)\\" . $file . " ";
+        #! $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;

     }
 
     foreach $file (sort keys %wxMSW) {
         #! don't take files not appropriate for 16-bit Windows
         next if $wxMSW{$file} =~ /\b(32|O)\b/;
 
     }
 
     foreach $file (sort keys %wxMSW) {
         #! 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/;
         $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!
 
 # This file was automatically generated by tmake at #$ Now()
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 


@@ -68,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
 
 # 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_CTL3D=1
 
 !if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"
 USE_CTL3D=0

-USE_XPM_IN_MSW=0

 !endif
 
 PERIPH_LIBS=
 !endif
 
 PERIPH_LIBS=


@@ -84,12 +92,6 @@ PERIPH_CLEAN_TARGET=
 # PERIPH_LIBS=d:\msdev\lib\ctl3d32.lib $(PERIPH_LIBS)
 # !endif
 
 # 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)
 # PNG and Zlib
 PERIPH_TARGET=png zlib $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_png clean_zlib $(PERIPH_CLEAN_TARGET)


@@ -101,58 +103,70 @@ MSWDIR=.
 
 GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
 
 
 GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
 

-COMMONOBJS = \
+# we can't have all objects in one list because the library becomes too big
+COMMONOBJS1 = \

                $(COMMDIR)\y_tab.obj \
                $(COMMDIR)\y_tab.obj \

-               #$ ExpandList("WXCOMMONOBJS");
-
-MSWOBJS = #$ ExpandList("WXMSWOBJS");
+               #$ ExpandList("WXCOMMONOBJS1");

 
 

-# TODO: Implement XPM and PNG targets in this makefile!
-#  $(OLEDIR)\xpmhand \
-#  $(OLEDIR)\pnghand \
+COMMONOBJS2 = \
+               #$ ExpandList("WXCOMMONOBJS2");

 
 

-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+# we can't have all objects in one list because the library becomes too big
+MSWOBJS1 = #$ ExpandList("WXMSWOBJS1");

 
 

-# Normal, static library
-all:    $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib
+MSWOBJS2 = #$ ExpandList("WXMSWOBJS2");

 
 

+OBJECTS = $(COMMONOBJS1) $(COMMONOBJS2) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)

 
 

-# $(WXDIR)\lib\wx.lib:      dummy.obj $(OBJECTS) $(PERIPH_LIBS)
-#      -erase $(LIBTARGET)
-#      lib /PAGESIZE:128 @<<
-# $(LIBTARGET)
-# y
-# $(OBJECTS) $(PERIPH_LIBS)
-# nul
-# ;
-# <<
+# Normal, static library
+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
        -erase $(WXDIR)\lib\wx1.lib
        lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx1.lib
 y

-$(COMMONOBJS) $(PERIPH_LIBS)
+$(COMMONOBJS1) $(PERIPH_LIBS)

 nul
 ;
 <<
 
 nul
 ;
 <<
 

-$(WXDIR)\lib\wx2.lib:      $(GENERICOBJS)
+$(WXDIR)\lib\wx2.lib:      $(COMMONOBJS2)

        -erase $(WXDIR)\lib\wx2.lib
        lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx2.lib
 y
        -erase $(WXDIR)\lib\wx2.lib
        lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx2.lib
 y

-$(GENERICOBJS)
+$(COMMONOBJS2)

 nul
 ;
 <<
 
 nul
 ;
 <<
 

-$(WXDIR)\lib\wx3.lib:      $(MSWOBJS)
+$(WXDIR)\lib\wx3.lib:      $(GENERICOBJS)

        -erase $(WXDIR)\lib\wx3.lib
        lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx3.lib
 y
        -erase $(WXDIR)\lib\wx3.lib
        lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx3.lib
 y

-$(MSWOBJS)
+$(GENERICOBJS)
+nul
+;
+<<
+
+$(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
 ;
 <<
 nul
 ;
 <<


@@ -174,14 +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) {
     my @objs = split;
     foreach (@objs) {

-        s:\\:/:;
-        $text .= $_ . ':     $*.$(SRCSUFF)' . "\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";
                  '        cl @<<' . "\n" .
                  '$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)' . "\n" .
                  "<<\n\n";

+        }

     }
 #$}
 
     }
 #$}
 


@@ -200,16 +223,6 @@ $(OBJECTS):        $(WXDIR)/include/wx/setup.h
 
 # Peripheral components
 
 
 # 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)
 zlib:
     cd $(WXDIR)\src\zlib
     nmake -f makefile.dos FINAL=$(FINAL)


@@ -253,3 +266,8 @@ clean: $(PERIPH_CLEAN_TARGET)
 cleanall: clean
 
 
 cleanall: clean
 
 

+MFTYPE=dos
+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