some fixes for VC++ 1.5 makefiles

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/dos.t b/distrib/msw/tmake/dos.t
index 4a4bdc1f5ec47cb00b4da8055ea4d2cd648056b2..b8e97b7ed3ff092fa61cd590d5738820ef8d0e75 100644 (file)
--- a/distrib/msw/tmake/dos.t
+++ b/distrib/msw/tmake/dos.t
@@ -15,7 +15,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 was compiled for VC++ 1.52
+            #! this file for some reason wasn't compiled for VC++ 1.52
             next unless $file =~ /^prntdlgg\./;
         }
 
@@ -27,8 +27,11 @@
         #! socket files don't compile under Win16 currently
         next if $wxCommon{$file} =~ /\b(32|S)\b/;
 
+        $isCFile = $file =~ /\.c$/;
         $file =~ s/cp?p?$/obj/;
-        $project{"WXCOMMONOBJS"} .= "\$(COMMDIR)\\" . $file . " "
+        $obj = "\$(COMMDIR)\\" . $file . " ";
+        $project{"WXCOMMONOBJS"} .= $obj;
+        $project{"WXCOBJS"} .= $obj if $isCFile;
     }
 
     foreach $file (sort keys %wxMSW) {
@@ -177,11 +180,20 @@ $(CPPFLAGS) /YcWX/WXPREC.H /c /Tp $*.$(SRCSUFF)
     $_ = $project{"WXMSWOBJS"} . $project{"WXCOMMONOBJS"} . $project{"WXGENERICOBJS"};
     my @objs = split;
     foreach (@objs) {
-        s:\\:/:;
-        $text .= $_ . ':     $*.$(SRCSUFF)' . "\n" .
-                 '        cl @<<' . "\n" .
-                 '$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)' . "\n" .
-                 "<<\n\n";
+       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";
+       }
     }
 #$}
 
@@ -196,17 +208,6 @@ $(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
     copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
 
-$(COMMDIR)/extended.obj:     $*.c
-        cl @<<
-$(CPPFLAGS2) /Fo$@ /c /Tc $*.c
-<<
-
-$(COMMDIR)/unzip.obj:     $*.c
-        cl @<<
-$(CPPFLAGS2) /Fo$@ /c /Tc $*.c
-<<
-
-
 $(OBJECTS):    $(WXDIR)/include/wx/setup.h
 
 # Peripheral components

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index d8a9dedd87c986e9debf271c32f9c5b1c0d7cec6..c6196e6a8292510f761d7489006c3e868d39c24a 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 14:47, 1999/09/05
+# This file was automatically generated by tmake at 22:42, 1999/09/05
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -551,11 +551,6 @@ $(MSWDIR)/penwin.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/pnghand.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(MSWDIR)/printdlg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -821,11 +816,6 @@ $(COMMDIR)/imaggif.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/imagpng.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(COMMDIR)/intl.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1207,8 +1197,7 @@ cleanall: clean
 
 
 MFTYPE=dos
-# Don't regenerate! We're out of sync for now.
-#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
+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