X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e85f5ec6cd4fa03839f30084975c8c89eb5ad2f..ad90972f272019228f98bc37d90bbff54b298fe3:/src/msw/makefile.vc

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 5ebec70f68..107fe650f1 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 10:46, 2000/04/27
+# This file was automatically generated by tmake at 15:57, 2000/08/04
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -27,6 +27,9 @@ LIBTARGET=$(WXLIB)
 DUMMYOBJ=$D\dummy.obj
 !endif
 
+# Please set these according to the settings in setup.h, so we can include
+# the appropriate libraries in wx.lib
+
 # This one overrides the others, to be consistent with the settings in setup.h
 MINIMAL_WXWINDOWS_SETUP=0
 
@@ -34,9 +37,6 @@ PERIPH_LIBS=
 PERIPH_TARGET=
 PERIPH_CLEAN_TARGET=
 
-# Set to 0 if not using GLCanvas (only affects DLL build)
-USE_GLCANVAS=1
-
 # These are absolute paths, so that the compiler
 # generates correct __FILE__ symbols for debugging.
 # Otherwise you don't be able to double-click on a memory
@@ -101,6 +101,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
 		..\generic\$D\proplist.obj \
 		..\generic\$D\sashwin.obj \
 		..\generic\$D\scrolwin.obj \
+		..\generic\$D\splash.obj \
 		..\generic\$D\splitter.obj \
 		..\generic\$D\statusbr.obj \
 		..\generic\$D\tabg.obj \
@@ -129,7 +130,7 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
 		..\generic\$D\printps.obj \
 		..\generic\$D\prntdlgg.obj \
 		..\generic\$D\statline.obj \
-		..\generic\$D\treectrl.obj
+		..\generic\$D\treectlg.obj
 
 COMMONOBJS = \
 		..\common\$D\y_tab.obj \
@@ -153,6 +154,7 @@ COMMONOBJS = \
 		..\common\$D\docview.obj \
 		..\common\$D\dynarray.obj \
 		..\common\$D\dynlib.obj \
+		..\common\$D\effects.obj \
 		..\common\$D\encconv.obj \
 		..\common\$D\event.obj \
 		..\common\$D\extended.obj \
@@ -202,6 +204,7 @@ COMMONOBJS = \
 		..\common\$D\prntbase.obj \
 		..\common\$D\process.obj \
 		..\common\$D\protocol.obj \
+		..\common\$D\quantize.obj \
 		..\common\$D\resource.obj \
 		..\common\$D\sckaddr.obj \
 		..\common\$D\sckfile.obj \
@@ -218,6 +221,7 @@ COMMONOBJS = \
 		..\common\$D\textfile.obj \
 		..\common\$D\timercmn.obj \
 		..\common\$D\tokenzr.obj \
+		..\common\$D\treebase.obj \
 		..\common\$D\txtstrm.obj \
 		..\common\$D\unzip.obj \
 		..\common\$D\url.obj \