X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae8f57691329af997e274a3fce5b25c5e5f00f2f..f6aa3903841dd7e65def0a69f01523afaae7cdcc:/src/msw/makefile.vc

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 6c8dbcbb98..a80f002c35 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 19:22, 1999/09/18
+# This file was automatically generated by tmake at 17:32, 1999/10/18
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -85,8 +85,9 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 
 GENERICOBJS= ..\generic\$D\busyinfo.obj \
 		..\generic\$D\choicdgg.obj \
-		..\generic\$D\gridg.obj \
+		..\generic\$D\grid.obj \
 		..\generic\$D\laywin.obj \
+		..\generic\$D\logg.obj \
 		..\generic\$D\numdlgg.obj \
 		..\generic\$D\panelg.obj \
 		..\generic\$D\progdlgg.obj \
@@ -124,6 +125,7 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
 
 COMMONOBJS = \
 		..\common\$D\y_tab.obj \
+		..\common\$D\appcmn.obj \
 		..\common\$D\choiccmn.obj \
 		..\common\$D\cmndata.obj \
 		..\common\$D\config.obj \
@@ -145,6 +147,7 @@ COMMONOBJS = \
 		..\common\$D\fileconf.obj \
 		..\common\$D\filefn.obj \
 		..\common\$D\filesys.obj \
+		..\common\$D\fontcmn.obj \
 		..\common\$D\framecmn.obj \
 		..\common\$D\fs_inet.obj \
 		..\common\$D\fs_zip.obj \
@@ -154,6 +157,7 @@ COMMONOBJS = \
 		..\common\$D\hash.obj \
 		..\common\$D\helpbase.obj \
 		..\common\$D\http.obj \
+		..\common\$D\imagall.obj \
 		..\common\$D\imagbmp.obj \
 		..\common\$D\image.obj \
 		..\common\$D\imaggif.obj \
@@ -282,6 +286,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
 		..\msw\$D\settings.obj \
 		..\msw\$D\slider95.obj \
 		..\msw\$D\spinbutt.obj \
+		..\msw\$D\spinctrl.obj \
 		..\msw\$D\statbmp.obj \
 		..\msw\$D\statbox.obj \
 		..\msw\$D\statbr95.obj \
@@ -302,25 +307,26 @@ MSWOBJS = ..\msw\$D\accel.obj \
 		..\msw\$D\window.obj \
 		..\msw\$D\xpmhand.obj
 
-HTMLOBJS = \
-  ..\html\$D\helpdata.obj \
-  ..\html\$D\helpfrm.obj \
-  ..\html\$D\helpctrl.obj \
-  ..\html\$D\htmlcell.obj \
-  ..\html\$D\htmlfilter.obj \
-  ..\html\$D\htmlparser.obj \
-  ..\html\$D\htmltag.obj \
-  ..\html\$D\htmlwin.obj \
-  ..\html\$D\htmlwinparser.obj \
-  ..\html\$D\mod_fonts.obj \
-  ..\html\$D\mod_hline.obj \
-  ..\html\$D\mod_image.obj \
-  ..\html\$D\mod_layout.obj \
-  ..\html\$D\mod_links.obj \
-  ..\html\$D\mod_list.obj \
-  ..\html\$D\mod_pre.obj \
-  ..\html\$D\mod_tables.obj \
-  ..\html\$D\search.obj
+HTMLOBJS = ..\html\$D\helpctrl.obj \
+		..\html\$D\helpdata.obj \
+		..\html\$D\helpfrm.obj \
+		..\html\$D\htmlcell.obj \
+		..\html\$D\htmlfilt.obj \
+		..\html\$D\htmlpars.obj \
+		..\html\$D\htmltag.obj \
+		..\html\$D\htmlwin.obj \
+		..\html\$D\htmprint.obj \
+		..\html\$D\m_fonts.obj \
+		..\html\$D\m_hline.obj \
+		..\html\$D\m_image.obj \
+		..\html\$D\m_layout.obj \
+		..\html\$D\m_links.obj \
+		..\html\$D\m_list.obj \
+		..\html\$D\m_pre.obj \
+		..\html\$D\m_tables.obj \
+		..\html\$D\search.obj \
+		..\html\$D\winpars.obj
+
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(HTMLOBJS) if wanting wxHTML classes
@@ -409,7 +415,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
 <<
 
 # Update the dynamic link library
-$(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\$(WXLIBNAME).lib
+$(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
     $(LINKFLAGS)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll
@@ -462,7 +468,7 @@ $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
 
 png:
     cd $(WXDIR)\src\png
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
     cd $(WXDIR)\src\msw
 
 clean_png:
@@ -472,7 +478,7 @@ clean_png:
 
 zlib:
     cd $(WXDIR)\src\zlib
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
     cd $(WXDIR)\src\msw
 
 clean_zlib:
@@ -482,7 +488,7 @@ clean_zlib:
 
 jpeg:
     cd $(WXDIR)\src\jpeg
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) all
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) all
     cd $(WXDIR)\src\msw
 
 clean_jpeg:
@@ -492,7 +498,7 @@ clean_jpeg:
 
 xpm:
     cd $(WXDIR)\src\xpm
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
     cd $(WXDIR)\src\msw
 
 clean_xpm:
@@ -505,7 +511,7 @@ rcparser:
     nmake -f makefile.vc FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg 
         -erase $(LIBTARGET)
         -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll