added wxHTML

[wxWidgets.git] / distrib / msw / tmake / vc.t

diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index 8d2c17b8b37546bd6b5b8581611654b7464efdae..6f4fa4377d3650e987f2e5533067e21386615e65 100644 (file)
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -112,6 +112,11 @@ $(CPPFLAGS2) /Fo$@ /c /Tc $<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
+{..\msw}.c{..\msw\$D}.obj:
+       cl @<<
+$(CPPFLAGS2) /Fo$@ /c /Tc $<
+<<
+
 {..\msw\ole}.cpp{..\msw\ole\$D}.obj:
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
@@ -135,10 +140,11 @@ COMMONOBJS = \
 MSWOBJS = #$ ExpandList("WXMSWOBJS");
 
 HTMLOBJS = \
+  ..\html\$D\helpdata.obj \
+  ..\html\$D\helpfrm.obj \
+  ..\html\$D\helpctrl.obj \
   ..\html\$D\htmlcell.obj \
   ..\html\$D\htmlfilter.obj \
-  ..\html\$D\htmlhelp.obj \
-  ..\html\$D\htmlhelp_io.obj \
   ..\html\$D\htmlparser.obj \
   ..\html\$D\htmltag.obj \
   ..\html\$D\htmlwin.obj \
@@ -155,7 +161,7 @@ HTMLOBJS = \
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(HTMLOBJS) if wanting wxHTML classes
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 # Normal, static library
 all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
@@ -240,7 +246,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