X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f1d93f0beeec9d88f8a225aa35a9ccc163dcdb15..67bd5bad041419c4714d09749737d5ea9876a47d:/src/msw/makefile.vc

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index d31e75f139..297b4118c6 100644
--- 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
@@ -94,7 +94,6 @@ GENERICOBJS= ..\generic\$D\busyinfo.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 \
@@ -164,6 +163,7 @@ COMMONOBJS = \
 		..\common\$D\file.obj \
 		..\common\$D\fileconf.obj \
 		..\common\$D\filefn.obj \
+		..\common\$D\filename.obj \
 		..\common\$D\filesys.obj \
 		..\common\$D\fontcmn.obj \
 		..\common\$D\fontmap.obj \
@@ -194,6 +194,7 @@ COMMONOBJS = \
 		..\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 \
@@ -330,6 +331,7 @@ MSWOBJS = ..\msw\$D\accel.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 \
@@ -368,7 +370,12 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \
 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
 
@@ -448,7 +455,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
 
 !if "$(USE_GLCANVAS)" == "1"
 GL_LIBS=opengl32.lib glu32.lib
-GL_LIBS_DELAY=/delayload:opengl32.dll
+# GL_LIBS_DELAY=/delayload:opengl32.dll
 !endif
 
 # Update the dynamic link library