merged optimizations from 2.2

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

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 8695f704d3bb88cbf7c3b69f0feb99424c2182a9..297b4118c6e0e14dc9c288d0eae87c43e10f14a0 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:13, 2000/09/12
+# This file was automatically generated by tmake at 19:20, 2001/02/08

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc


@@ -94,7 +94,6 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\logg.obj \
                ..\generic\$D\numdlgg.obj \
                ..\generic\$D\panelg.obj \
                ..\generic\$D\logg.obj \
                ..\generic\$D\numdlgg.obj \
                ..\generic\$D\panelg.obj \

-               ..\generic\$D\plot.obj \

                ..\generic\$D\progdlgg.obj \
                ..\generic\$D\prop.obj \
                ..\generic\$D\propform.obj \
                ..\generic\$D\progdlgg.obj \
                ..\generic\$D\prop.obj \
                ..\generic\$D\propform.obj \


@@ -195,6 +194,7 @@ COMMONOBJS = \
                ..\common\$D\list.obj \
                ..\common\$D\log.obj \
                ..\common\$D\longlong.obj \
                ..\common\$D\list.obj \
                ..\common\$D\log.obj \
                ..\common\$D\longlong.obj \

+               ..\common\$D\matrix.obj \

                ..\common\$D\memory.obj \
                ..\common\$D\menucmn.obj \
                ..\common\$D\mimecmn.obj \
                ..\common\$D\memory.obj \
                ..\common\$D\menucmn.obj \
                ..\common\$D\mimecmn.obj \


@@ -331,6 +331,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
                ..\msw\$D\taskbar.obj \
                ..\msw\$D\tbar95.obj \
                ..\msw\$D\textctrl.obj \
                ..\msw\$D\taskbar.obj \
                ..\msw\$D\tbar95.obj \
                ..\msw\$D\textctrl.obj \

+               ..\msw\$D\tglbtn.obj \

                ..\msw\$D\thread.obj \
                ..\msw\$D\timer.obj \
                ..\msw\$D\tooltip.obj \
                ..\msw\$D\thread.obj \
                ..\msw\$D\timer.obj \
                ..\msw\$D\tooltip.obj \


@@ -369,7 +370,12 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 # Normal, static library
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 # Normal, static library

-all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
+all:    setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
+
+setuph:
+    cd $(WXDIR)\include\wx\msw
+    if not exist setup.h copy setup0.h setup.h
+    cd $(WXDIR)\src\msw

 
 dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
 
 
 dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D