X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c5d3e1ccd1d27ab0cf913ddbffb1b54b5802f3a..da8bed9bfd3e15e637feb4ed3fa783c82759fefc:/src/msw/makefile.vc?ds=sidebyside

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 1daf224332..d2034a804e 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 20:03, 1999/09/29
+# This file was automatically generated by tmake at 15:31, 1999/10/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -85,7 +85,7 @@ $(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 \
@@ -156,6 +156,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 \
@@ -163,6 +164,7 @@ COMMONOBJS = \
 		..\common\$D\imagpcx.obj \
 		..\common\$D\imagpng.obj \
 		..\common\$D\imagpnm.obj \
+		..\common\$D\init.obj \
 		..\common\$D\intl.obj \
 		..\common\$D\ipcbase.obj \
 		..\common\$D\layout.obj \
@@ -304,25 +306,25 @@ 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\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
@@ -411,7 +413,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
@@ -464,7 +466,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:
@@ -474,7 +476,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:
@@ -484,7 +486,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:
@@ -494,7 +496,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:
@@ -507,7 +509,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