1) some cleanup in wxHtmlWindow, moved private structures out of headers

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

diff --git a/contrib/src/xml/makefile.b32 b/contrib/src/xml/makefile.b32
index 70ed81e9635ae81847f86e040b727726195c5aec..0078a6370de95ef3a3cf1d0de24208ce71fdc949 100644 (file)
--- a/contrib/src/xml/makefile.b32
+++ b/contrib/src/xml/makefile.b32
@@ -9,7 +9,30 @@
 
 WXDIR = $(WXWIN)
 
-EXTRACPPFLAGS=/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\include
+wxLIBXMLDIR=/Ic:\progra~1\libxml\libxml2-2.3.3\include
+
+!if "$(wxLIBXMLDIR)" == ""
+!message
+!message SETUP REQUIRED
+!message
+!message You must set the wxLIBXMLDIR variable in makefile.b32 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
+EXTRACPPFLAGS=$(wxLIBXMLDIR)
+
 
 LIBTARGET=$(WXDIR)\lib\wxxml.lib
 
@@ -17,8 +40,9 @@ OBJECTS=xml.obj xmlbin.obj xmlbinz.obj xmlpars.obj xmlres.obj xmlrsall.obj \
         xh_bttn.obj xh_chckb.obj xh_chckl.obj xh_choic.obj xh_combo.obj xh_dlg.obj \
         xh_gauge.obj xh_html.obj xh_menu.obj xh_notbk.obj xh_panel.obj xh_radbt.obj \
         xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj \
-        xh_text.obj xh_listb.obj xh_toolb.obj \
-        xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj xh_tree.obj
+        xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj \
+        xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj \
+        xh_tree.obj xh_unkwn.obj xh_frame.obj
 
 !include $(WXDIR)\src\makelib.b32