reverted the hack for accepting broken HHC files (new wxHF_xxxx flags provide same...

[wxWidgets.git] / contrib / src / xml / makefile.vc

diff --git a/contrib/src/xml/makefile.vc b/contrib/src/xml/makefile.vc
index e3efd284244ecb9c30142dd072c91bc34a464280..9457ffcfc86ee15e164ec1bda4c873d3886ddce9 100644 (file)
--- a/contrib/src/xml/makefile.vc
+++ b/contrib/src/xml/makefile.vc
@@ -19,8 +19,28 @@ THISDIR = $(WXDIR)\contrib\src\xml
 DOCDIR=$(WXDIR)\contrib\docs
 LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\xml
 
 DOCDIR=$(WXDIR)\contrib\docs
 LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\xml
 

-# Set this to where your libxml is
-EXTRAFLAGS=-Id:\libxml\libxml2-2.1.1
+# Do not specify the 'libxml' directory on
+# this -I line, as the #includes use
+# <libxml/xxxx.h>.  If your libxml is installed
+# in "d:\libxml\libxml2-2.1.1\libxml" you would use:
+# wxLIBXMLDIR=-Id:\libxml\libxml2-2.1.1
+wxLIBXMLDIR=
+
+!if "$(wxLIBXMLDIR)" == ""
+!message
+!message SETUP REQUIRED
+!message
+!message You must set the wxLIBXMLDIR variable in makefile.vc before compiling
+!message
+!message If you do not have the libxml library, you will need to obtain & install
+!message it before compiling the wxXML code.  You can obtain libxml from:
+!message http://www.xmlsoft.org
+!message
+!error
+!endif
+
+# Set this to where your libxml directory is
+EXTRAFLAGS=$(wxLIBXMLDIR)

 
 # Unfortunately we need this _before_ we include makelib.vc
 !if "$(FINAL)" == "1"
 
 # Unfortunately we need this _before_ we include makelib.vc
 !if "$(FINAL)" == "1"


@@ -35,9 +55,12 @@ EXTRATARGETS=$(D)
 
 OBJECTS=$(D)\xml.obj $(D)\xmlbin.obj $(D)\xmlbinz.obj $(D)\xmlpars.obj $(D)\xmlres.obj $(D)\xmlrsall.obj \
         $(D)\xh_bttn.obj $(D)\xh_chckb.obj $(D)\xh_chckl.obj $(D)\xh_choic.obj $(D)\xh_combo.obj $(D)\xh_dlg.obj \
 
 OBJECTS=$(D)\xml.obj $(D)\xmlbin.obj $(D)\xmlbinz.obj $(D)\xmlpars.obj $(D)\xmlres.obj $(D)\xmlrsall.obj \
         $(D)\xh_bttn.obj $(D)\xh_chckb.obj $(D)\xh_chckl.obj $(D)\xh_choic.obj $(D)\xh_combo.obj $(D)\xh_dlg.obj \

-        $(D)\xh_gauge.obj $(D)\xh_html.obj $(D)\xh_menu.obj $(D)\xh_notbk.obj $(D)\xh_panel.obj $(D)\xh_radbt.obj \
+        $(D)\xh_frame.obj $(D)\xh_gauge.obj $(D)\xh_html.obj $(D)\xh_menu.obj $(D)\xh_notbk.obj $(D)\xh_panel.obj $(D)\xh_radbt.obj \

         $(D)\xh_radbx.obj $(D)\xh_sizer.obj $(D)\xh_slidr.obj $(D)\xh_spin.obj $(D)\xh_stbmp.obj $(D)\xh_sttxt.obj \
         $(D)\xh_radbx.obj $(D)\xh_sizer.obj $(D)\xh_slidr.obj $(D)\xh_spin.obj $(D)\xh_stbmp.obj $(D)\xh_sttxt.obj \

-        $(D)\xh_text.obj $(D)\xh_listb.obj
+        $(D)\xh_text.obj $(D)\xh_listb.obj $(D)\xh_toolb.obj \
+        $(D)\xh_bmpbt.obj $(D)\xh_cald.obj $(D)\xh_listc.obj $(D)\xh_scrol.obj \
+        $(D)\xh_stbox.obj $(D)\xh_tree.obj $(D)\xh_stlin.obj $(D)\xh_bmp.obj \
+        $(D)\xh_unkwn.obj

 
 !include $(WXDIR)\src\makelib.vc
 
 
 !include $(WXDIR)\src\makelib.vc
 


@@ -98,8 +121,8 @@ $(DOCDIR)\htmlhelp\xml.chm: $(DOCDIR)\html\xml\xml.htm $(DOCDIR)\html\xml\xml.hh
 # Optionally, a cached version of the .hhp file can be generated with hhp2cached.
 $(DOCDIR)\htb\xml.htb: $(DOCDIR)\html\xml\xml.htm
        cd $(DOCDIR)\html\xml
 # Optionally, a cached version of the .hhp file can be generated with hhp2cached.
 $(DOCDIR)\htb\xml.htb: $(DOCDIR)\html\xml\xml.htm
        cd $(DOCDIR)\html\xml

-    -erase /Y xml.zip xml.htb
-    zip32 xml.zip *.htm *.gif *.hhp *.hhc *.hhk
+    -erase xml.zip xml.htb
+    zip xml.zip *.htm *.gif *.hhp *.hhc *.hhk

     -mkdir $(DOCDIR)\htb
     move xml.zip $(DOCDIR)\htb\xml.htb
     cd $(THISDIR)
     -mkdir $(DOCDIR)\htb
     move xml.zip $(DOCDIR)\htb\xml.htb
     cd $(THISDIR)