X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66e23ad2081689dad6e829b9667cdbc93ac45154..803c55373484d1e2bfed85b46cbbfff8bfad1276:/src/msw/makefile.vc?ds=sidebyside

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index f940d3b6aa..35f0b0f0f8 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:44, 2001/05/09
+# This file was automatically generated by tmake at 18:20, 2001/05/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -89,6 +89,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
 		..\generic\$D\dirctrlg.obj \
 		..\generic\$D\dragimgg.obj \
 		..\generic\$D\grid.obj \
+		..\generic\$D\gridctrl.obj \
 		..\generic\$D\gridsel.obj \
 		..\generic\$D\laywin.obj \
 		..\generic\$D\logg.obj \
@@ -149,6 +150,7 @@ COMMONOBJS = \
 		..\common\$D\db.obj \
 		..\common\$D\dbtable.obj \
 		..\common\$D\dcbase.obj \
+		..\common\$D\dircmn.obj \
 		..\common\$D\dlgcmn.obj \
 		..\common\$D\dndcmn.obj \
 		..\common\$D\dobjcmn.obj \
@@ -464,11 +466,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
     $(LINKFLAGS)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll
-<<<<<<< vc.t
-    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib  $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
-=======
     $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
->>>>>>> 1.32
 	delayimp.lib
 	/delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
 	/delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll