Solved problem with wxhInstance name being mangled by MSVC

[wxWidgets.git] / src / msw / makefile.vc

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 13a878eeb242d5f84195cd627bdfb8f80aaa9cc5..678fe19d410594bf7564e0389aabddcbf31fa8cb 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:14, 1999/08/18
+# This file was automatically generated by tmake at 21:04, 1999/09/12
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -68,6 +68,11 @@ $(CPPFLAGS2) /Fo$@ /c /Tc $<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
+{..\msw}.c{..\msw\$D}.obj:
+       cl @<<
+$(CPPFLAGS2) /Fo$@ /c /Tc $<
+<<
+
 {..\msw\ole}.cpp{..\msw\ole\$D}.obj:
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
@@ -114,6 +119,7 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
                ..\generic\$D\notebook.obj \
                ..\generic\$D\printps.obj \
                ..\generic\$D\prntdlgg.obj \
+               ..\generic\$D\statline.obj \
                ..\generic\$D\treectrl.obj
 
 COMMONOBJS = \
@@ -152,6 +158,7 @@ COMMONOBJS = \
                ..\common\$D\image.obj \
                ..\common\$D\imaggif.obj \
                ..\common\$D\imagjpeg.obj \
+               ..\common\$D\imagpcx.obj \
                ..\common\$D\imagpng.obj \
                ..\common\$D\imagpnm.obj \
                ..\common\$D\intl.obj \
@@ -181,6 +188,7 @@ COMMONOBJS = \
                ..\common\$D\stream.obj \
                ..\common\$D\string.obj \
                ..\common\$D\tbarbase.obj \
+               ..\common\$D\tbarsmpl.obj \
                ..\common\$D\textcmn.obj \
                ..\common\$D\textfile.obj \
                ..\common\$D\time.obj \
@@ -240,6 +248,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\frame.obj \
                ..\msw\$D\gauge95.obj \
                ..\msw\$D\gdiobj.obj \
+               ..\msw\$D\gsocket.obj \
                ..\msw\$D\helpwin.obj \
                ..\msw\$D\icon.obj \
                ..\msw\$D\imaglist.obj \
@@ -293,10 +302,11 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\xpmhand.obj
 
 HTMLOBJS = \
+  ..\html\$D\helpdata.obj \
+  ..\html\$D\helpfrm.obj \
+  ..\html\$D\helpctrl.obj \
   ..\html\$D\htmlcell.obj \
   ..\html\$D\htmlfilter.obj \
-  ..\html\$D\htmlhelp.obj \
-  ..\html\$D\htmlhelp_io.obj \
   ..\html\$D\htmlparser.obj \
   ..\html\$D\htmltag.obj \
   ..\html\$D\htmlwin.obj \
@@ -688,8 +698,8 @@ $(DOCDIR)/pdf/porting.rtf:         $(DOCDIR)/latex/porting/porting.tex
 
 $(DOCDIR)/pdf/prop.rtf:         $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex
         cd $(DOCDIR)\latex\proplist
-        -copy *.bmp $(DOCDIR)\pdf
         -copy *.wmf $(DOCDIR)\pdf
+        -copy *.bmp $(DOCDIR)\pdf
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf
         cd $(THISDIR)