removed libxpm dependencies from makefiles

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

diff --git a/contrib/src/xml/makefile.b32 b/contrib/src/xml/makefile.b32
index e36bbc6cbbc12c46eac6eb486692a23607ad436a..0d68e0b28b5379f33ced5598719865d159cf9dfb 100644 (file)
--- a/contrib/src/xml/makefile.b32
+++ b/contrib/src/xml/makefile.b32
@@ -9,15 +9,32 @@
 
 WXDIR = $(WXWIN)
 
 
 WXDIR = $(WXWIN)
 

-EXTRACPPFLAGS=/Id:\libxml\libxml2-2.1.1
+expat_dir = $(WXDIR)\contrib\src\xml\expat
+XMLPARSEDIR = $(expat_dir)\xmlparse 
+XMLTOKDIR = $(expat_dir)\xmltok
+
+EXPAT_DEFS=-I$(expat_dir)\xmlparse -I$(expat_dir)\xmltok
+EXPAT_OBJECTS=xmltok.obj xmlrole.obj xmlparse.obj
+
+EXTRACPPFLAGS=$(wxLIBXMLDIR) $(EXPAT_DEFS)

 
 LIBTARGET=$(WXDIR)\lib\wxxml.lib
 
 
 LIBTARGET=$(WXDIR)\lib\wxxml.lib
 

-OBJECTS=xml.obj xmlbin.obj xmlbinz.obj xmlpars.obj xmlres.obj xmlrsall.obj \
+OBJECTS=$(EXPAT_OBJECTS) \
+        xml.obj xmlbin.obj xmlbinz.obj xmlexpat.obj xmlwrite.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_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_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
 
 
 !include $(WXDIR)\src\makelib.b32
 

+{$(XMLPARSEDIR)}.c.obj:
+       bcc32 $(EXPAT_DEFS) -c -w-ccc -w-rch -w-par {$< }
+
+{$(XMLTOKDIR)}.c.obj:
+       bcc32 $(EXPAT_DEFS) -c -w-ccc -w-rch -w-par {$< }
+
+