1. wxShell fixes: now really uses shell (it wasn't different from wxExecute!)

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

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 58344b50a96b798322b175a2b15d1b26930c0128..36afd2f14ccab749ac3eee20c794150fe8cfc70b 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 14:31, 2000/01/19
+# This file was automatically generated by tmake at 16:52, 2000/02/29
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -86,6 +86,7 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\calctrl.obj \
                ..\generic\$D\choicdgg.obj \
+               ..\generic\$D\dragimgg.obj \
                ..\generic\$D\grid.obj \
                ..\generic\$D\laywin.obj \
                ..\generic\$D\logg.obj \
@@ -103,6 +104,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\tbarsmpl.obj \
                ..\generic\$D\textdlgg.obj \
                ..\generic\$D\tipdlg.obj \
+               ..\generic\$D\treelay.obj \
                ..\generic\$D\wizard.obj
 
 # These are generic things that don't need to be compiled on MSW,
@@ -143,6 +145,7 @@ COMMONOBJS = \
                ..\common\$D\dbtable.obj \
                ..\common\$D\dcbase.obj \
                ..\common\$D\dlgcmn.obj \
+               ..\common\$D\dndcmn.obj \
                ..\common\$D\dobjcmn.obj \
                ..\common\$D\docmdi.obj \
                ..\common\$D\docview.obj \
@@ -160,9 +163,11 @@ COMMONOBJS = \
                ..\common\$D\fontmap.obj \
                ..\common\$D\framecmn.obj \
                ..\common\$D\fs_inet.obj \
+               ..\common\$D\fs_mem.obj \
                ..\common\$D\fs_zip.obj \
                ..\common\$D\ftp.obj \
                ..\common\$D\gdicmn.obj \
+               ..\common\$D\geometry.obj \
                ..\common\$D\gifdecod.obj \
                ..\common\$D\hash.obj \
                ..\common\$D\helpbase.obj \
@@ -271,6 +276,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\gauge95.obj \
                ..\msw\$D\gdiimage.obj \
                ..\msw\$D\gdiobj.obj \
+               ..\msw\$D\glcanvas.obj \
                ..\msw\$D\gsocket.obj \
                ..\msw\$D\helpwin.obj \
                ..\msw\$D\icon.obj \
@@ -455,6 +461,64 @@ $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\w
 $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
 <<
 
+# Compile certain files with no optimization (some files cause a
+# compiler crash for buggy versions of VC++, e.g. 4.0)
+noopt:
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\datetime.obj /c /Tp $(COMMDIR)\datetime.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\encconv.obj /c /Tp $(COMMDIR)\encconv.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\fileconf.obj /c /Tp $(COMMDIR)\fileconf.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\resource.obj /c /Tp $(COMMDIR)\resource.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\textfile.obj /c /Tp $(COMMDIR)\textfile.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\choicdgg.obj /c /Tp $(GENDIR)\choicdgg.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\grid.obj /c /Tp $(GENDIR)\grid.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\proplist.obj /c /Tp $(GENDIR)\proplist.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\clipbrd.obj /c /Tp $(MSWDIR)\clipbrd.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\control.obj /c /Tp $(MSWDIR)\control.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\listbox.obj /c /Tp $(MSWDIR)\listbox.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\mdi.obj /c /Tp $(MSWDIR)\mdi.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\menu.obj /c /Tp $(MSWDIR)\menu.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\notebook.obj /c /Tp $(MSWDIR)\notebook.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\tbar95.obj /c /Tp $(MSWDIR)\tbar95.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\treectrl.obj /c /Tp $(MSWDIR)\treectrl.cpp
+<<
+       cl @<<
+$(CPPFLAGS2) /Od /Fo$(HTMLDIR)\$D\helpfrm.obj /c /Tp $(HTMLDIR)\helpfrm.cpp
+<<
+
 # If taking wxWindows from CVS, setup.h doesn't exist yet.
 # Actually the 'if not exist setup.h' test doesn't work
 # (copies the file anyway)