X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0f3e3e0c300988a7520b39b90d28517b84882190..bfac8499858dbb52ae4e712b718dcd08e777b4c2:/src/msw/makefile.vc

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 908bb54ae8..7b8e046e4b 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -70,6 +70,7 @@ GENERICOBJS= \
   ..\generic\$D\gridg.obj \
   ..\generic\$D\laywin.obj \
   ..\generic\$D\panelg.obj \
+  ..\generic\$D\progdlgg.obj \
   ..\generic\$D\prop.obj \
   ..\generic\$D\propform.obj \
   ..\generic\$D\proplist.obj \
@@ -98,6 +99,7 @@ NONESSENTIALOBJS= \
 COMMONOBJS = \
   ..\common\$D\cmndata.obj \
   ..\common\$D\config.obj \
+  ..\common\$D\dcbase.obj \
   ..\common\$D\db.obj \
   ..\common\$D\dbtable.obj \
   ..\common\$D\docview.obj \
@@ -174,6 +176,7 @@ MSWOBJS = \
   ..\msw\$D\button.obj \
   ..\msw\$D\checkbox.obj \
   ..\msw\$D\checklst.obj \
+  ..\msw\$D\caret.obj \
   ..\msw\$D\choice.obj \
   ..\msw\$D\clipbrd.obj \
   ..\msw\$D\colordlg.obj \
@@ -345,7 +348,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\$(WXLIBNAME).
     $(link) @<<
     $(LINKFLAGS)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll
-    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib
+    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib $(WXDIR)\lib\jpeg.lib
 <<
 
 !endif
@@ -483,6 +486,7 @@ proppdfrtf: $(DOCDIR)/pdf/prop.rtf
 refpdfrtf: $(DOCDIR)/pdf/techref.rtf
 html:	wxhtml portinghtml
 wxhtml:	$(DOCDIR)\html\wx\wx.htm
+htmlhelp: $(DOCDIR)\html\wx\wx.chm
 prophtml: $(DOCDIR)\html\proplist\prop.htm
 ps:     wxps referencps
 wxps:	$(WXDIR)\docs\ps\wx.ps
@@ -644,6 +648,12 @@ $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
         -erase $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
+$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
+	cd $(DOCDIR)\html\wx
+	-hhc wx.hhp
+	cd $(THISDIR)
+
+
 $(DOCDIR)\html\porting\port.htm:         $(DOCDIR)\latex\porting\porting.tex
         cd $(DOCDIR)\latex\porting
         -mkdir $(DOCDIR)\html\porting