From a90d7e684a686ac02d3b2453d62615511b04cc32 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 20 Jul 2003 22:12:55 +0000 Subject: [PATCH] moved XML classes to the core git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/build/xrc/makefile.bcc | 57 ++------ contrib/build/xrc/makefile.gcc | 41 ++---- contrib/build/xrc/makefile.vc | 39 ++---- contrib/build/xrc/makefile.wat | 44 ++----- contrib/build/xrc/xrc.bkl | 11 +- contrib/include/wx/xrc/xml.h | 226 -------------------------------- contrib/include/wx/xrc/xmlres.h | 10 +- include/wx/xrc/xml.h | 226 -------------------------------- include/wx/xrc/xmlres.h | 10 +- 9 files changed, 56 insertions(+), 608 deletions(-) delete mode 100644 contrib/include/wx/xrc/xml.h delete mode 100644 include/wx/xrc/xml.h diff --git a/contrib/build/xrc/makefile.bcc b/contrib/build/xrc/makefile.bcc index 88fa7afca3..03818aa584 100644 --- a/contrib/build/xrc/makefile.bcc +++ b/contrib/build/xrc/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -22,15 +22,6 @@ BCCDIR = $(MAKEDIR)\.. OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \ - -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include \ - -I..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ - -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg \ - -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib \ - -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\include \ - -DWXUSINGDLL -DWXMAKINGDLL_XRC -I..\..\src\xrc\expat\xmlparse \ - -I..\..\src\xrc\expat\xmltok $(CFLAGS) XRCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include \ @@ -38,16 +29,7 @@ XRCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg \ -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib \ -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\include \ - -DWXUSINGDLL -DWXMAKINGDLL_XRC -I..\..\src\xrc\expat\xmlparse \ - -I..\..\src\xrc\expat\xmltok $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_xrcdll.csm -XRCLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \ - -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include \ - -I..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ - -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg \ - -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib \ - -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\include \ - -I..\..\src\xrc\expat\xmlparse -I..\..\src\xrc\expat\xmltok $(CFLAGS) + -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_xrcdll.csm XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include \ @@ -129,6 +111,9 @@ __WXLIB_HTML_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib +!endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ !endif @@ -258,24 +243,12 @@ $(OBJS)\xrcdll_xh_unkwn.obj: ../../src/xrc\xh_unkwn.cpp $(OBJS)\xrcdll_xh_wizrd.obj: ../../src/xrc\xh_wizrd.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** -$(OBJS)\xrcdll_xml.obj: ../../src/xrc\xml.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** - -$(OBJS)\xrcdll_xmlparse.obj: ../../src/xrc\expat\xmlparse\xmlparse.c - $(CC) -q -c -P- -o$@ $(XRCDLL_CFLAGS) $** - $(OBJS)\xrcdll_xmlres.obj: ../../src/xrc\xmlres.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** -$(OBJS)\xrcdll_xmlrole.obj: ../../src/xrc\expat\xmltok\xmlrole.c - $(CC) -q -c -P- -o$@ $(XRCDLL_CFLAGS) $** - $(OBJS)\xrcdll_xmlrsall.obj: ../../src/xrc\xmlrsall.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** -$(OBJS)\xrcdll_xmltok.obj: ../../src/xrc\expat\xmltok\xmltok.c - $(CC) -q -c -P- -o$@ $(XRCDLL_CFLAGS) $** - $(OBJS)\xrclib_dummy.obj: ../../src/xrc\..\..\..\src\msw\dummy.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) -H $** @@ -384,24 +357,12 @@ $(OBJS)\xrclib_xh_unkwn.obj: ../../src/xrc\xh_unkwn.cpp $(OBJS)\xrclib_xh_wizrd.obj: ../../src/xrc\xh_wizrd.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** -$(OBJS)\xrclib_xml.obj: ../../src/xrc\xml.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** - -$(OBJS)\xrclib_xmlparse.obj: ../../src/xrc\expat\xmlparse\xmlparse.c - $(CC) -q -c -P- -o$@ $(XRCLIB_CFLAGS) $** - $(OBJS)\xrclib_xmlres.obj: ../../src/xrc\xmlres.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** -$(OBJS)\xrclib_xmlrole.obj: ../../src/xrc\expat\xmltok\xmlrole.c - $(CC) -q -c -P- -o$@ $(XRCLIB_CFLAGS) $** - $(OBJS)\xrclib_xmlrsall.obj: ../../src/xrc\xmlrsall.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** -$(OBJS)\xrclib_xmltok.obj: ../../src/xrc\expat\xmltok\xmltok.c - $(CC) -q -c -P- -o$@ $(XRCLIB_CFLAGS) $** - clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res @@ -410,17 +371,17 @@ clean: -if exist ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib !if "$(SHARED)" == "1" -..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlparse.obj $(OBJS)\xrcdll_xmltok.obj $(OBJS)\xrcdll_xmlrole.obj $(OBJS)\xrcdll_xml.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj +..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| - c0d32.obj $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlparse.obj $(OBJS)\xrcdll_xmltok.obj $(OBJS)\xrcdll_xmlrole.obj $(OBJS)\xrcdll_xml.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, + c0d32.obj $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, | implib -f ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $@ !endif !if "$(SHARED)" == "0" -..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib: $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlparse.obj $(OBJS)\xrclib_xmltok.obj $(OBJS)\xrclib_xmlrole.obj $(OBJS)\xrclib_xml.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj +..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib: $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj if exist $@ del $@ tlib /a /p2048 $@ @&&| - $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlparse.obj $(OBJS)\xrclib_xmltok.obj $(OBJS)\xrclib_xmlrole.obj $(OBJS)\xrclib_xml.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj + $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj | !endif diff --git a/contrib/build/xrc/makefile.gcc b/contrib/build/xrc/makefile.gcc index 560809488f..8013d20f2b 100644 --- a/contrib/build/xrc/makefile.gcc +++ b/contrib/build/xrc/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,9 +13,7 @@ include ../../../build/config.gcc ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC -I..\..\src\xrc\expat\xmlparse -I..\..\src\xrc\expat\xmltok $(CFLAGS) -XRCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC -I..\..\src\xrc\expat\xmlparse -I..\..\src\xrc\expat\xmltok $(CXXFLAGS) -XRCLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\include -I..\..\src\xrc\expat\xmlparse -I..\..\src\xrc\expat\xmltok $(CFLAGS) +XRCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\include -I..\..\src\xrc\expat\xmlparse -I..\..\src\xrc\expat\xmltok $(CXXFLAGS) ### Conditionally set variables: ### @@ -77,6 +75,9 @@ endif ifeq ($(MONOLITHIC),1) __WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif +ifeq ($(MONOLITHIC),0) +__WXLIB_XML_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml +endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ endif @@ -204,24 +205,12 @@ $(OBJS)\xrcdll_xh_unkwn.o: ../../src/xrc\xh_unkwn.cpp $(OBJS)\xrcdll_xh_wizrd.o: ../../src/xrc\xh_wizrd.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< -$(OBJS)\xrcdll_xml.o: ../../src/xrc\xml.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xmlparse.o: ../../src/xrc\expat\xmlparse\xmlparse.c - $(CC) -c -o $@ $(XRCDLL_CFLAGS) $< - $(OBJS)\xrcdll_xmlres.o: ../../src/xrc\xmlres.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< -$(OBJS)\xrcdll_xmlrole.o: ../../src/xrc\expat\xmltok\xmlrole.c - $(CC) -c -o $@ $(XRCDLL_CFLAGS) $< - $(OBJS)\xrcdll_xmlrsall.o: ../../src/xrc\xmlrsall.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< -$(OBJS)\xrcdll_xmltok.o: ../../src/xrc\expat\xmltok\xmltok.c - $(CC) -c -o $@ $(XRCDLL_CFLAGS) $< - $(OBJS)\xrclib_dummy.o: ../../src/xrc\..\..\..\src\msw\dummy.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< @@ -330,24 +319,12 @@ $(OBJS)\xrclib_xh_unkwn.o: ../../src/xrc\xh_unkwn.cpp $(OBJS)\xrclib_xh_wizrd.o: ../../src/xrc\xh_wizrd.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< -$(OBJS)\xrclib_xml.o: ../../src/xrc\xml.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xmlparse.o: ../../src/xrc\expat\xmlparse\xmlparse.c - $(CC) -c -o $@ $(XRCLIB_CFLAGS) $< - $(OBJS)\xrclib_xmlres.o: ../../src/xrc\xmlres.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< -$(OBJS)\xrclib_xmlrole.o: ../../src/xrc\expat\xmltok\xmlrole.c - $(CC) -c -o $@ $(XRCLIB_CFLAGS) $< - $(OBJS)\xrclib_xmlrsall.o: ../../src/xrc\xmlrsall.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< -$(OBJS)\xrclib_xmltok.o: ../../src/xrc\expat\xmltok\xmltok.c - $(CC) -c -o $@ $(XRCLIB_CFLAGS) $< - clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll del ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll @@ -355,14 +332,14 @@ clean: -if exist ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a del ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a ifeq ($(SHARED),1) -..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.o $(OBJS)\xrcdll_xmlparse.o $(OBJS)\xrcdll_xmltok.o $(OBJS)\xrcdll_xmlrole.o $(OBJS)\xrcdll_xml.o $(OBJS)\xrcdll_xmlres.o $(OBJS)\xrcdll_xh_bmp.o $(OBJS)\xrcdll_xh_bmpbt.o $(OBJS)\xrcdll_xh_bttn.o $(OBJS)\xrcdll_xh_cald.o $(OBJS)\xrcdll_xh_chckb.o $(OBJS)\xrcdll_xh_chckl.o $(OBJS)\xrcdll_xh_choic.o $(OBJS)\xrcdll_xh_combo.o $(OBJS)\xrcdll_xh_dlg.o $(OBJS)\xrcdll_xh_frame.o $(OBJS)\xrcdll_xh_gauge.o $(OBJS)\xrcdll_xh_gdctl.o $(OBJS)\xrcdll_xh_html.o $(OBJS)\xrcdll_xh_listb.o $(OBJS)\xrcdll_xh_listc.o $(OBJS)\xrcdll_xh_menu.o $(OBJS)\xrcdll_xh_notbk.o $(OBJS)\xrcdll_xh_panel.o $(OBJS)\xrcdll_xh_radbt.o $(OBJS)\xrcdll_xh_radbx.o $(OBJS)\xrcdll_xh_scrol.o $(OBJS)\xrcdll_xh_scwin.o $(OBJS)\xrcdll_xh_sizer.o $(OBJS)\xrcdll_xh_slidr.o $(OBJS)\xrcdll_xh_spin.o $(OBJS)\xrcdll_xh_split.o $(OBJS)\xrcdll_xh_stbmp.o $(OBJS)\xrcdll_xh_stbox.o $(OBJS)\xrcdll_xh_stlin.o $(OBJS)\xrcdll_xh_sttxt.o $(OBJS)\xrcdll_xh_text.o $(OBJS)\xrcdll_xh_toolb.o $(OBJS)\xrcdll_xh_tree.o $(OBJS)\xrcdll_xh_unkwn.o $(OBJS)\xrcdll_xh_wizrd.o $(OBJS)\xrcdll_xmlrsall.o - $(CXX) -shared -o $@ $(OBJS)\xrcdll_dummy.o $(OBJS)\xrcdll_xmlparse.o $(OBJS)\xrcdll_xmltok.o $(OBJS)\xrcdll_xmlrole.o $(OBJS)\xrcdll_xml.o $(OBJS)\xrcdll_xmlres.o $(OBJS)\xrcdll_xh_bmp.o $(OBJS)\xrcdll_xh_bmpbt.o $(OBJS)\xrcdll_xh_bttn.o $(OBJS)\xrcdll_xh_cald.o $(OBJS)\xrcdll_xh_chckb.o $(OBJS)\xrcdll_xh_chckl.o $(OBJS)\xrcdll_xh_choic.o $(OBJS)\xrcdll_xh_combo.o $(OBJS)\xrcdll_xh_dlg.o $(OBJS)\xrcdll_xh_frame.o $(OBJS)\xrcdll_xh_gauge.o $(OBJS)\xrcdll_xh_gdctl.o $(OBJS)\xrcdll_xh_html.o $(OBJS)\xrcdll_xh_listb.o $(OBJS)\xrcdll_xh_listc.o $(OBJS)\xrcdll_xh_menu.o $(OBJS)\xrcdll_xh_notbk.o $(OBJS)\xrcdll_xh_panel.o $(OBJS)\xrcdll_xh_radbt.o $(OBJS)\xrcdll_xh_radbx.o $(OBJS)\xrcdll_xh_scrol.o $(OBJS)\xrcdll_xh_scwin.o $(OBJS)\xrcdll_xh_sizer.o $(OBJS)\xrcdll_xh_slidr.o $(OBJS)\xrcdll_xh_spin.o $(OBJS)\xrcdll_xh_split.o $(OBJS)\xrcdll_xh_stbmp.o $(OBJS)\xrcdll_xh_stbox.o $(OBJS)\xrcdll_xh_stlin.o $(OBJS)\xrcdll_xh_sttxt.o $(OBJS)\xrcdll_xh_text.o $(OBJS)\xrcdll_xh_toolb.o $(OBJS)\xrcdll_xh_tree.o $(OBJS)\xrcdll_xh_unkwn.o $(OBJS)\xrcdll_xh_wizrd.o $(OBJS)\xrcdll_xmlrsall.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.o $(OBJS)\xrcdll_xmlres.o $(OBJS)\xrcdll_xh_bmp.o $(OBJS)\xrcdll_xh_bmpbt.o $(OBJS)\xrcdll_xh_bttn.o $(OBJS)\xrcdll_xh_cald.o $(OBJS)\xrcdll_xh_chckb.o $(OBJS)\xrcdll_xh_chckl.o $(OBJS)\xrcdll_xh_choic.o $(OBJS)\xrcdll_xh_combo.o $(OBJS)\xrcdll_xh_dlg.o $(OBJS)\xrcdll_xh_frame.o $(OBJS)\xrcdll_xh_gauge.o $(OBJS)\xrcdll_xh_gdctl.o $(OBJS)\xrcdll_xh_html.o $(OBJS)\xrcdll_xh_listb.o $(OBJS)\xrcdll_xh_listc.o $(OBJS)\xrcdll_xh_menu.o $(OBJS)\xrcdll_xh_notbk.o $(OBJS)\xrcdll_xh_panel.o $(OBJS)\xrcdll_xh_radbt.o $(OBJS)\xrcdll_xh_radbx.o $(OBJS)\xrcdll_xh_scrol.o $(OBJS)\xrcdll_xh_scwin.o $(OBJS)\xrcdll_xh_sizer.o $(OBJS)\xrcdll_xh_slidr.o $(OBJS)\xrcdll_xh_spin.o $(OBJS)\xrcdll_xh_split.o $(OBJS)\xrcdll_xh_stbmp.o $(OBJS)\xrcdll_xh_stbox.o $(OBJS)\xrcdll_xh_stlin.o $(OBJS)\xrcdll_xh_sttxt.o $(OBJS)\xrcdll_xh_text.o $(OBJS)\xrcdll_xh_toolb.o $(OBJS)\xrcdll_xh_tree.o $(OBJS)\xrcdll_xh_unkwn.o $(OBJS)\xrcdll_xh_wizrd.o $(OBJS)\xrcdll_xmlrsall.o + $(CXX) -shared -o $@ $(OBJS)\xrcdll_dummy.o $(OBJS)\xrcdll_xmlres.o $(OBJS)\xrcdll_xh_bmp.o $(OBJS)\xrcdll_xh_bmpbt.o $(OBJS)\xrcdll_xh_bttn.o $(OBJS)\xrcdll_xh_cald.o $(OBJS)\xrcdll_xh_chckb.o $(OBJS)\xrcdll_xh_chckl.o $(OBJS)\xrcdll_xh_choic.o $(OBJS)\xrcdll_xh_combo.o $(OBJS)\xrcdll_xh_dlg.o $(OBJS)\xrcdll_xh_frame.o $(OBJS)\xrcdll_xh_gauge.o $(OBJS)\xrcdll_xh_gdctl.o $(OBJS)\xrcdll_xh_html.o $(OBJS)\xrcdll_xh_listb.o $(OBJS)\xrcdll_xh_listc.o $(OBJS)\xrcdll_xh_menu.o $(OBJS)\xrcdll_xh_notbk.o $(OBJS)\xrcdll_xh_panel.o $(OBJS)\xrcdll_xh_radbt.o $(OBJS)\xrcdll_xh_radbx.o $(OBJS)\xrcdll_xh_scrol.o $(OBJS)\xrcdll_xh_scwin.o $(OBJS)\xrcdll_xh_sizer.o $(OBJS)\xrcdll_xh_slidr.o $(OBJS)\xrcdll_xh_spin.o $(OBJS)\xrcdll_xh_split.o $(OBJS)\xrcdll_xh_stbmp.o $(OBJS)\xrcdll_xh_stbox.o $(OBJS)\xrcdll_xh_stlin.o $(OBJS)\xrcdll_xh_sttxt.o $(OBJS)\xrcdll_xh_text.o $(OBJS)\xrcdll_xh_toolb.o $(OBJS)\xrcdll_xh_tree.o $(OBJS)\xrcdll_xh_unkwn.o $(OBJS)\xrcdll_xh_wizrd.o $(OBJS)\xrcdll_xmlrsall.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) endif ifeq ($(SHARED),0) -..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a: $(OBJS)\xrclib_dummy.o $(OBJS)\xrclib_xmlparse.o $(OBJS)\xrclib_xmltok.o $(OBJS)\xrclib_xmlrole.o $(OBJS)\xrclib_xml.o $(OBJS)\xrclib_xmlres.o $(OBJS)\xrclib_xh_bmp.o $(OBJS)\xrclib_xh_bmpbt.o $(OBJS)\xrclib_xh_bttn.o $(OBJS)\xrclib_xh_cald.o $(OBJS)\xrclib_xh_chckb.o $(OBJS)\xrclib_xh_chckl.o $(OBJS)\xrclib_xh_choic.o $(OBJS)\xrclib_xh_combo.o $(OBJS)\xrclib_xh_dlg.o $(OBJS)\xrclib_xh_frame.o $(OBJS)\xrclib_xh_gauge.o $(OBJS)\xrclib_xh_gdctl.o $(OBJS)\xrclib_xh_html.o $(OBJS)\xrclib_xh_listb.o $(OBJS)\xrclib_xh_listc.o $(OBJS)\xrclib_xh_menu.o $(OBJS)\xrclib_xh_notbk.o $(OBJS)\xrclib_xh_panel.o $(OBJS)\xrclib_xh_radbt.o $(OBJS)\xrclib_xh_radbx.o $(OBJS)\xrclib_xh_scrol.o $(OBJS)\xrclib_xh_scwin.o $(OBJS)\xrclib_xh_sizer.o $(OBJS)\xrclib_xh_slidr.o $(OBJS)\xrclib_xh_spin.o $(OBJS)\xrclib_xh_split.o $(OBJS)\xrclib_xh_stbmp.o $(OBJS)\xrclib_xh_stbox.o $(OBJS)\xrclib_xh_stlin.o $(OBJS)\xrclib_xh_sttxt.o $(OBJS)\xrclib_xh_text.o $(OBJS)\xrclib_xh_toolb.o $(OBJS)\xrclib_xh_tree.o $(OBJS)\xrclib_xh_unkwn.o $(OBJS)\xrclib_xh_wizrd.o $(OBJS)\xrclib_xmlrsall.o +..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a: $(OBJS)\xrclib_dummy.o $(OBJS)\xrclib_xmlres.o $(OBJS)\xrclib_xh_bmp.o $(OBJS)\xrclib_xh_bmpbt.o $(OBJS)\xrclib_xh_bttn.o $(OBJS)\xrclib_xh_cald.o $(OBJS)\xrclib_xh_chckb.o $(OBJS)\xrclib_xh_chckl.o $(OBJS)\xrclib_xh_choic.o $(OBJS)\xrclib_xh_combo.o $(OBJS)\xrclib_xh_dlg.o $(OBJS)\xrclib_xh_frame.o $(OBJS)\xrclib_xh_gauge.o $(OBJS)\xrclib_xh_gdctl.o $(OBJS)\xrclib_xh_html.o $(OBJS)\xrclib_xh_listb.o $(OBJS)\xrclib_xh_listc.o $(OBJS)\xrclib_xh_menu.o $(OBJS)\xrclib_xh_notbk.o $(OBJS)\xrclib_xh_panel.o $(OBJS)\xrclib_xh_radbt.o $(OBJS)\xrclib_xh_radbx.o $(OBJS)\xrclib_xh_scrol.o $(OBJS)\xrclib_xh_scwin.o $(OBJS)\xrclib_xh_sizer.o $(OBJS)\xrclib_xh_slidr.o $(OBJS)\xrclib_xh_spin.o $(OBJS)\xrclib_xh_split.o $(OBJS)\xrclib_xh_stbmp.o $(OBJS)\xrclib_xh_stbox.o $(OBJS)\xrclib_xh_stlin.o $(OBJS)\xrclib_xh_sttxt.o $(OBJS)\xrclib_xh_text.o $(OBJS)\xrclib_xh_toolb.o $(OBJS)\xrclib_xh_tree.o $(OBJS)\xrclib_xh_unkwn.o $(OBJS)\xrclib_xh_wizrd.o $(OBJS)\xrclib_xmlrsall.o if exist $@ del $@ - ar rcu $@ $(OBJS)\xrclib_dummy.o $(OBJS)\xrclib_xmlparse.o $(OBJS)\xrclib_xmltok.o $(OBJS)\xrclib_xmlrole.o $(OBJS)\xrclib_xml.o $(OBJS)\xrclib_xmlres.o $(OBJS)\xrclib_xh_bmp.o $(OBJS)\xrclib_xh_bmpbt.o $(OBJS)\xrclib_xh_bttn.o $(OBJS)\xrclib_xh_cald.o $(OBJS)\xrclib_xh_chckb.o $(OBJS)\xrclib_xh_chckl.o $(OBJS)\xrclib_xh_choic.o $(OBJS)\xrclib_xh_combo.o $(OBJS)\xrclib_xh_dlg.o $(OBJS)\xrclib_xh_frame.o $(OBJS)\xrclib_xh_gauge.o $(OBJS)\xrclib_xh_gdctl.o $(OBJS)\xrclib_xh_html.o $(OBJS)\xrclib_xh_listb.o $(OBJS)\xrclib_xh_listc.o $(OBJS)\xrclib_xh_menu.o $(OBJS)\xrclib_xh_notbk.o $(OBJS)\xrclib_xh_panel.o $(OBJS)\xrclib_xh_radbt.o $(OBJS)\xrclib_xh_radbx.o $(OBJS)\xrclib_xh_scrol.o $(OBJS)\xrclib_xh_scwin.o $(OBJS)\xrclib_xh_sizer.o $(OBJS)\xrclib_xh_slidr.o $(OBJS)\xrclib_xh_spin.o $(OBJS)\xrclib_xh_split.o $(OBJS)\xrclib_xh_stbmp.o $(OBJS)\xrclib_xh_stbox.o $(OBJS)\xrclib_xh_stlin.o $(OBJS)\xrclib_xh_sttxt.o $(OBJS)\xrclib_xh_text.o $(OBJS)\xrclib_xh_toolb.o $(OBJS)\xrclib_xh_tree.o $(OBJS)\xrclib_xh_unkwn.o $(OBJS)\xrclib_xh_wizrd.o $(OBJS)\xrclib_xmlrsall.o + ar rcu $@ $(OBJS)\xrclib_dummy.o $(OBJS)\xrclib_xmlres.o $(OBJS)\xrclib_xh_bmp.o $(OBJS)\xrclib_xh_bmpbt.o $(OBJS)\xrclib_xh_bttn.o $(OBJS)\xrclib_xh_cald.o $(OBJS)\xrclib_xh_chckb.o $(OBJS)\xrclib_xh_chckl.o $(OBJS)\xrclib_xh_choic.o $(OBJS)\xrclib_xh_combo.o $(OBJS)\xrclib_xh_dlg.o $(OBJS)\xrclib_xh_frame.o $(OBJS)\xrclib_xh_gauge.o $(OBJS)\xrclib_xh_gdctl.o $(OBJS)\xrclib_xh_html.o $(OBJS)\xrclib_xh_listb.o $(OBJS)\xrclib_xh_listc.o $(OBJS)\xrclib_xh_menu.o $(OBJS)\xrclib_xh_notbk.o $(OBJS)\xrclib_xh_panel.o $(OBJS)\xrclib_xh_radbt.o $(OBJS)\xrclib_xh_radbx.o $(OBJS)\xrclib_xh_scrol.o $(OBJS)\xrclib_xh_scwin.o $(OBJS)\xrclib_xh_sizer.o $(OBJS)\xrclib_xh_slidr.o $(OBJS)\xrclib_xh_spin.o $(OBJS)\xrclib_xh_split.o $(OBJS)\xrclib_xh_stbmp.o $(OBJS)\xrclib_xh_stbox.o $(OBJS)\xrclib_xh_stlin.o $(OBJS)\xrclib_xh_sttxt.o $(OBJS)\xrclib_xh_text.o $(OBJS)\xrclib_xh_toolb.o $(OBJS)\xrclib_xh_tree.o $(OBJS)\xrclib_xh_unkwn.o $(OBJS)\xrclib_xh_wizrd.o $(OBJS)\xrclib_xmlrsall.o ranlib $@ endif diff --git a/contrib/build/xrc/makefile.vc b/contrib/build/xrc/makefile.vc index 9277ea5f78..ca4c778b03 100644 --- a/contrib/build/xrc/makefile.vc +++ b/contrib/build/xrc/makefile.vc @@ -13,9 +13,7 @@ ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\xrc\..\..\..\include /I..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\xrc\..\..\..\src\tiff /I..\..\src\xrc\..\..\..\src\jpeg /I..\..\src\xrc\..\..\..\src\png /I..\..\src\xrc\..\..\..\src\zlib /I..\..\src\xrc\..\..\..\src\regex /Fp$(OBJS)\wxprec_xrcdll.pch /I..\..\src\xrc\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_XRC /I..\..\src\xrc\expat\xmlparse /I..\..\src\xrc\expat\xmltok $(CFLAGS) -XRCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\xrc\..\..\..\include /I..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\xrc\..\..\..\src\tiff /I..\..\src\xrc\..\..\..\src\jpeg /I..\..\src\xrc\..\..\..\src\png /I..\..\src\xrc\..\..\..\src\zlib /I..\..\src\xrc\..\..\..\src\regex /Fp$(OBJS)\wxprec_xrcdll.pch /I..\..\src\xrc\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_XRC /I..\..\src\xrc\expat\xmlparse /I..\..\src\xrc\expat\xmltok $(CXXFLAGS) /Yuwx/wxprec.h -XRCLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\xrc\..\..\..\include /I..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\xrc\..\..\..\src\tiff /I..\..\src\xrc\..\..\..\src\jpeg /I..\..\src\xrc\..\..\..\src\png /I..\..\src\xrc\..\..\..\src\zlib /I..\..\src\xrc\..\..\..\src\regex /Fp$(OBJS)\wxprec_xrclib.pch /I..\..\src\xrc\..\..\include /I..\..\src\xrc\expat\xmlparse /I..\..\src\xrc\expat\xmltok $(CFLAGS) +XRCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\xrc\..\..\..\include /I..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\xrc\..\..\..\src\tiff /I..\..\src\xrc\..\..\..\src\jpeg /I..\..\src\xrc\..\..\..\src\png /I..\..\src\xrc\..\..\..\src\zlib /I..\..\src\xrc\..\..\..\src\regex /Fp$(OBJS)\wxprec_xrcdll.pch /I..\..\src\xrc\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_XRC $(CXXFLAGS) /Yuwx/wxprec.h XRCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\xrc\..\..\..\include /I..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\xrc\..\..\..\src\tiff /I..\..\src\xrc\..\..\..\src\jpeg /I..\..\src\xrc\..\..\..\src\png /I..\..\src\xrc\..\..\..\src\zlib /I..\..\src\xrc\..\..\..\src\regex /Fp$(OBJS)\wxprec_xrclib.pch /I..\..\src\xrc\..\..\include /I..\..\src\xrc\expat\xmlparse /I..\..\src\xrc\expat\xmltok $(CXXFLAGS) /Yuwx/wxprec.h ### Conditionally set variables: ### @@ -92,6 +90,9 @@ __WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html !if "$(MONOLITHIC)" == "1" __WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib +!endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif @@ -219,24 +220,12 @@ $(OBJS)\xrcdll_xh_unkwn.obj: ../../src/xrc\xh_unkwn.cpp $(OBJS)\xrcdll_xh_wizrd.obj: ../../src/xrc\xh_wizrd.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** -$(OBJS)\xrcdll_xml.obj: ../../src/xrc\xml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** - -$(OBJS)\xrcdll_xmlparse.obj: ../../src/xrc\expat\xmlparse\xmlparse.c - $(CC) /c /nologo /TC /Fo$@ $(XRCDLL_CFLAGS) $** - $(OBJS)\xrcdll_xmlres.obj: ../../src/xrc\xmlres.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** -$(OBJS)\xrcdll_xmlrole.obj: ../../src/xrc\expat\xmltok\xmlrole.c - $(CC) /c /nologo /TC /Fo$@ $(XRCDLL_CFLAGS) $** - $(OBJS)\xrcdll_xmlrsall.obj: ../../src/xrc\xmlrsall.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** -$(OBJS)\xrcdll_xmltok.obj: ../../src/xrc\expat\xmltok\xmltok.c - $(CC) /c /nologo /TC /Fo$@ $(XRCDLL_CFLAGS) $** - $(OBJS)\xrclib_dummy.obj: ../../src/xrc\..\..\..\src\msw\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h $** @@ -345,24 +334,12 @@ $(OBJS)\xrclib_xh_unkwn.obj: ../../src/xrc\xh_unkwn.cpp $(OBJS)\xrclib_xh_wizrd.obj: ../../src/xrc\xh_wizrd.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** -$(OBJS)\xrclib_xml.obj: ../../src/xrc\xml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** - -$(OBJS)\xrclib_xmlparse.obj: ../../src/xrc\expat\xmlparse\xmlparse.c - $(CC) /c /nologo /TC /Fo$@ $(XRCLIB_CFLAGS) $** - $(OBJS)\xrclib_xmlres.obj: ../../src/xrc\xmlres.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** -$(OBJS)\xrclib_xmlrole.obj: ../../src/xrc\expat\xmltok\xmlrole.c - $(CC) /c /nologo /TC /Fo$@ $(XRCLIB_CFLAGS) $** - $(OBJS)\xrclib_xmlrsall.obj: ../../src/xrc\xmlrsall.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** -$(OBJS)\xrclib_xmltok.obj: ../../src/xrc\expat\xmltok\xmltok.c - $(CC) /c /nologo /TC /Fo$@ $(XRCLIB_CFLAGS) $** - clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res @@ -371,16 +348,16 @@ clean: -if exist ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib !if "$(SHARED)" == "1" -..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlparse.obj $(OBJS)\xrcdll_xmltok.obj $(OBJS)\xrcdll_xmlrole.obj $(OBJS)\xrcdll_xml.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj +..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @<< - $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlparse.obj $(OBJS)\xrcdll_xmltok.obj $(OBJS)\xrcdll_xmlrole.obj $(OBJS)\xrcdll_xml.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib + $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) /IMPLIB:..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib << !endif !if "$(SHARED)" == "0" -..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib: $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlparse.obj $(OBJS)\xrclib_xmltok.obj $(OBJS)\xrclib_xmlrole.obj $(OBJS)\xrclib_xml.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj +..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib: $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< - $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlparse.obj $(OBJS)\xrclib_xmltok.obj $(OBJS)\xrclib_xmlrole.obj $(OBJS)\xrclib_xml.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj + $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj << !endif diff --git a/contrib/build/xrc/makefile.wat b/contrib/build/xrc/makefile.wat index 0a980420e7..02e86c9dd9 100644 --- a/contrib/build/xrc/makefile.wat +++ b/contrib/build/xrc/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -109,6 +109,10 @@ __WXLIB_MONO_p = !ifeq MONOLITHIC 1 __WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif +__WXLIB_XML_p = +!ifeq MONOLITHIC 0 +__WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib +!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -125,9 +129,7 @@ __xrclib___depname = ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WX ### Variables: ### OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDLL_CFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_xrcdll.pch -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\xrc\..\..\..\src\tiff -i=..\..\src\xrc\..\..\..\src\jpeg -i=..\..\src\xrc\..\..\..\src\png -i=..\..\src\xrc\..\..\..\src\zlib -i=..\..\src\xrc\..\..\..\src\regex -i=..\..\src\xrc\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_XRC -i=..\..\src\xrc\expat\xmlparse -i=..\..\src\xrc\expat\xmltok $(CFLAGS) -XRCDLL_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_xrcdll.pch -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\xrc\..\..\..\src\tiff -i=..\..\src\xrc\..\..\..\src\jpeg -i=..\..\src\xrc\..\..\..\src\png -i=..\..\src\xrc\..\..\..\src\zlib -i=..\..\src\xrc\..\..\..\src\regex -i=..\..\src\xrc\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_XRC -i=..\..\src\xrc\expat\xmlparse -i=..\..\src\xrc\expat\xmltok $(CXXFLAGS) -XRCLIB_CFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_xrclib.pch $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\xrc\..\..\..\src\tiff -i=..\..\src\xrc\..\..\..\src\jpeg -i=..\..\src\xrc\..\..\..\src\png -i=..\..\src\xrc\..\..\..\src\zlib -i=..\..\src\xrc\..\..\..\src\regex -i=..\..\src\xrc\..\..\include -i=..\..\src\xrc\expat\xmlparse -i=..\..\src\xrc\expat\xmltok $(CFLAGS) +XRCDLL_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_xrcdll.pch -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\xrc\..\..\..\src\tiff -i=..\..\src\xrc\..\..\..\src\jpeg -i=..\..\src\xrc\..\..\..\src\png -i=..\..\src\xrc\..\..\..\src\zlib -i=..\..\src\xrc\..\..\..\src\regex -i=..\..\src\xrc\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_XRC $(CXXFLAGS) XRCLIB_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_xrclib.pch $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\xrc\..\..\..\src\tiff -i=..\..\src\xrc\..\..\..\src\jpeg -i=..\..\src\xrc\..\..\..\src\png -i=..\..\src\xrc\..\..\..\src\zlib -i=..\..\src\xrc\..\..\..\src\regex -i=..\..\src\xrc\..\..\include -i=..\..\src\xrc\expat\xmlparse -i=..\..\src\xrc\expat\xmltok $(CXXFLAGS) @@ -248,24 +250,12 @@ $(OBJS)\xrcdll_xh_unkwn.obj : .AUTODEPEND ../../src/xrc\xh_unkwn.cpp $(OBJS)\xrcdll_xh_wizrd.obj : .AUTODEPEND ../../src/xrc\xh_wizrd.cpp $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< -$(OBJS)\xrcdll_xml.obj : .AUTODEPEND ../../src/xrc\xml.cpp - $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xmlparse.obj : .AUTODEPEND ../../src/xrc\expat\xmlparse\xmlparse.c - $(CC) -zq -fo=$^@ $(XRCDLL_CFLAGS) $< - $(OBJS)\xrcdll_xmlres.obj : .AUTODEPEND ../../src/xrc\xmlres.cpp $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< -$(OBJS)\xrcdll_xmlrole.obj : .AUTODEPEND ../../src/xrc\expat\xmltok\xmlrole.c - $(CC) -zq -fo=$^@ $(XRCDLL_CFLAGS) $< - $(OBJS)\xrcdll_xmlrsall.obj : .AUTODEPEND ../../src/xrc\xmlrsall.cpp $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< -$(OBJS)\xrcdll_xmltok.obj : .AUTODEPEND ../../src/xrc\expat\xmltok\xmltok.c - $(CC) -zq -fo=$^@ $(XRCDLL_CFLAGS) $< - $(OBJS)\xrclib_dummy.obj : .AUTODEPEND ../../src/xrc\..\..\..\src\msw\dummy.cpp $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< @@ -374,24 +364,12 @@ $(OBJS)\xrclib_xh_unkwn.obj : .AUTODEPEND ../../src/xrc\xh_unkwn.cpp $(OBJS)\xrclib_xh_wizrd.obj : .AUTODEPEND ../../src/xrc\xh_wizrd.cpp $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< -$(OBJS)\xrclib_xml.obj : .AUTODEPEND ../../src/xrc\xml.cpp - $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xmlparse.obj : .AUTODEPEND ../../src/xrc\expat\xmlparse\xmlparse.c - $(CC) -zq -fo=$^@ $(XRCLIB_CFLAGS) $< - $(OBJS)\xrclib_xmlres.obj : .AUTODEPEND ../../src/xrc\xmlres.cpp $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< -$(OBJS)\xrclib_xmlrole.obj : .AUTODEPEND ../../src/xrc\expat\xmltok\xmlrole.c - $(CC) -zq -fo=$^@ $(XRCLIB_CFLAGS) $< - $(OBJS)\xrclib_xmlrsall.obj : .AUTODEPEND ../../src/xrc\xmlrsall.cpp $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< -$(OBJS)\xrclib_xmltok.obj : .AUTODEPEND ../../src/xrc\expat\xmltok\xmltok.c - $(CC) -zq -fo=$^@ $(XRCLIB_CFLAGS) $< - clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res @@ -402,14 +380,14 @@ clean : .SYMBOLIC -if exist ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib !ifeq SHARED 1 -..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll : $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlparse.obj $(OBJS)\xrcdll_xmltok.obj $(OBJS)\xrcdll_xmlrole.obj $(OBJS)\xrcdll_xml.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj +..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll : $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj @%create $(OBJS)\xrcdll.lbc @%append $(OBJS)\xrcdll.lbc option quiet @%append $(OBJS)\xrcdll.lbc name $^@ @%append $(OBJS)\xrcdll.lbc option incremental @%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) - @for %i in ( $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlparse.obj $(OBJS)\xrcdll_xmltok.obj $(OBJS)\xrcdll_xmlrole.obj $(OBJS)\xrcdll_xml.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj) do @%append $(OBJS)\xrcdll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\xrcdll.lbc library %i + @for %i in ( $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj) do @%append $(OBJS)\xrcdll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\xrcdll.lbc library %i @%append $(OBJS)\xrcdll.lbc @%append $(OBJS)\xrcdll.lbc system nt_dll wlink @$(OBJS)\xrcdll.lbc @@ -417,8 +395,8 @@ clean : .SYMBOLIC !endif !ifeq SHARED 0 -..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib : $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlparse.obj $(OBJS)\xrclib_xmltok.obj $(OBJS)\xrclib_xmlrole.obj $(OBJS)\xrclib_xml.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj +..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib : $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj @%create $(OBJS)\xrclib.lbc - @for %i in ( $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlparse.obj $(OBJS)\xrclib_xmltok.obj $(OBJS)\xrclib_xmlrole.obj $(OBJS)\xrclib_xml.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj) do @%append $(OBJS)\xrclib.lbc +%i + @for %i in ( $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj) do @%append $(OBJS)\xrclib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\xrclib.lbc !endif diff --git a/contrib/build/xrc/xrc.bkl b/contrib/build/xrc/xrc.bkl index e9ff9816c4..ff0456b96c 100644 --- a/contrib/build/xrc/xrc.bkl +++ b/contrib/build/xrc/xrc.bkl @@ -6,15 +6,8 @@ - - expat/xmlparse/xmlparse.c - expat/xmltok/xmltok.c - expat/xmltok/xmlrole.c - - xml.cpp xmlres.cpp - xh_bmp.cpp xh_bmpbt.cpp @@ -56,7 +49,6 @@ - wx/xrc/xml.h wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h @@ -100,11 +92,10 @@ WXUSINGDLL WXMAKINGDLL_XRC - $(SRCDIR)/expat/xmlparse - $(SRCDIR)/expat/xmltok $(XRC_SRC) html core + xml base diff --git a/contrib/include/wx/xrc/xml.h b/contrib/include/wx/xrc/xml.h deleted file mode 100644 index c65d1364ff..0000000000 --- a/contrib/include/wx/xrc/xml.h +++ /dev/null @@ -1,226 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: xml.h -// Purpose: wxXmlDocument - XML parser & data holder class -// Author: Vaclav Slavik -// Created: 2000/03/05 -// RCS-ID: $Id$ -// Copyright: (c) 2000 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_XML_H_ -#define _WX_XML_H_ - -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "xml.h" -#endif - -#include "wx/defs.h" -#include "wx/string.h" -#include "wx/object.h" -#include "wx/list.h" - -#ifdef WXMAKINGDLL_XRC - #define WXDLLIMPEXP_XRC WXEXPORT -#elif defined(WXUSINGDLL) - #define WXDLLIMPEXP_XRC WXIMPORT -#else // not making nor using DLL - #define WXDLLIMPEXP_XRC -#endif - -class WXDLLIMPEXP_XRC wxXmlNode; -class WXDLLIMPEXP_XRC wxXmlProperty; -class WXDLLIMPEXP_XRC wxXmlDocument; -class WXDLLIMPEXP_XRC wxXmlIOHandler; -class WXDLLEXPORT wxInputStream; -class WXDLLEXPORT wxOutputStream; - - -// Represents XML node type. -enum wxXmlNodeType -{ - // note: values are synchronized with xmlElementType from libxml - wxXML_ELEMENT_NODE = 1, - wxXML_ATTRIBUTE_NODE = 2, - wxXML_TEXT_NODE = 3, - wxXML_CDATA_SECTION_NODE = 4, - wxXML_ENTITY_REF_NODE = 5, - wxXML_ENTITY_NODE = 6, - wxXML_PI_NODE = 7, - wxXML_COMMENT_NODE = 8, - wxXML_DOCUMENT_NODE = 9, - wxXML_DOCUMENT_TYPE_NODE = 10, - wxXML_DOCUMENT_FRAG_NODE = 11, - wxXML_NOTATION_NODE = 12, - wxXML_HTML_DOCUMENT_NODE = 13 -}; - - -// Represents node property(ies). -// Example: in "src" is property with value -// "hello.gif" and "id" is prop. with value "3". - -class WXDLLIMPEXP_XRC wxXmlProperty -{ -public: - wxXmlProperty() : m_next(NULL) {} - wxXmlProperty(const wxString& name, const wxString& value, - wxXmlProperty *next) - : m_name(name), m_value(value), m_next(next) {} - - wxString GetName() const { return m_name; } - wxString GetValue() const { return m_value; } - wxXmlProperty *GetNext() const { return m_next; } - - void SetName(const wxString& name) { m_name = name; } - void SetValue(const wxString& value) { m_value = value; } - void SetNext(wxXmlProperty *next) { m_next = next; } - -private: - wxString m_name; - wxString m_value; - wxXmlProperty *m_next; -}; - - - -// Represents node in XML document. Node has name and may have content -// and properties. Most common node types are wxXML_TEXT_NODE (name and props -// are irrelevant) and wxXML_ELEMENT_NODE (e.g. in hi there is -// element with name="title", irrelevant content and one child (wxXML_TEXT_NODE -// with content="hi"). -// -// If wxUSE_UNICODE is 0, all strings are encoded in the encoding given to Load -// (default is UTF-8). - -class WXDLLIMPEXP_XRC wxXmlNode -{ -public: - wxXmlNode() : m_properties(NULL), m_parent(NULL), - m_children(NULL), m_next(NULL) {} - wxXmlNode(wxXmlNode *parent,wxXmlNodeType type, - const wxString& name, const wxString& content, - wxXmlProperty *props, wxXmlNode *next); - ~wxXmlNode(); - - // copy ctor & operator=. Note that this does NOT copy syblings - // and parent pointer, i.e. m_parent and m_next will be NULL - // after using copy ctor and are never unmodified by operator=. - // On the other hand, it DOES copy children and properties. - wxXmlNode(const wxXmlNode& node); - wxXmlNode& operator=(const wxXmlNode& node); - - // user-friendly creation: - wxXmlNode(wxXmlNodeType type, const wxString& name, - const wxString& content = wxEmptyString); - void AddChild(wxXmlNode *child); - void InsertChild(wxXmlNode *child, wxXmlNode *before_node); - bool RemoveChild(wxXmlNode *child); - void AddProperty(const wxString& name, const wxString& value); - bool DeleteProperty(const wxString& name); - - // access methods: - wxXmlNodeType GetType() const { return m_type; } - wxString GetName() const { return m_name; } - wxString GetContent() const { return m_content; } - - wxXmlNode *GetParent() const { return m_parent; } - wxXmlNode *GetNext() const { return m_next; } - wxXmlNode *GetChildren() const { return m_children; } - - wxXmlProperty *GetProperties() const { return m_properties; } - bool GetPropVal(const wxString& propName, wxString *value) const; - wxString GetPropVal(const wxString& propName, - const wxString& defaultVal) const; - bool HasProp(const wxString& propName) const; - - void SetType(wxXmlNodeType type) { m_type = type; } - void SetName(const wxString& name) { m_name = name; } - void SetContent(const wxString& con) { m_content = con; } - - void SetParent(wxXmlNode *parent) { m_parent = parent; } - void SetNext(wxXmlNode *next) { m_next = next; } - void SetChildren(wxXmlNode *child) { m_children = child; } - - void SetProperties(wxXmlProperty *prop) { m_properties = prop; } - void AddProperty(wxXmlProperty *prop); - -private: - wxXmlNodeType m_type; - wxString m_name; - wxString m_content; - wxXmlProperty *m_properties; - wxXmlNode *m_parent, *m_children, *m_next; - - void DoCopy(const wxXmlNode& node); -}; - - - - - - - -// This class holds XML data/document as parsed by XML parser. - -class WXDLLIMPEXP_XRC wxXmlDocument : public wxObject -{ -public: - wxXmlDocument(); - wxXmlDocument(const wxString& filename, - const wxString& encoding = wxT("UTF-8")); - wxXmlDocument(wxInputStream& stream, - const wxString& encoding = wxT("UTF-8")); - ~wxXmlDocument() { delete m_root; } - - wxXmlDocument(const wxXmlDocument& doc); - wxXmlDocument& operator=(const wxXmlDocument& doc); - - // Parses .xml file and loads data. Returns TRUE on success, FALSE - // otherwise. - bool Load(const wxString& filename, - const wxString& encoding = wxT("UTF-8")); - bool Load(wxInputStream& stream, - const wxString& encoding = wxT("UTF-8")); - - // Saves document as .xml file. - bool Save(const wxString& filename) const; - bool Save(wxOutputStream& stream) const; - - bool IsOk() const { return m_root != NULL; } - - // Returns root node of the document. - wxXmlNode *GetRoot() const { return m_root; } - - // Returns version of document (may be empty). - wxString GetVersion() const { return m_version; } - // Returns encoding of document (may be empty). - // Note: this is the encoding original file was saved in, *not* the - // encoding of in-memory representation! - wxString GetFileEncoding() const { return m_fileEncoding; } - - // Write-access methods: - void SetRoot(wxXmlNode *node) { delete m_root ; m_root = node; } - void SetVersion(const wxString& version) { m_version = version; } - void SetFileEncoding(const wxString& encoding) { m_fileEncoding = encoding; } - -#if !wxUSE_UNICODE - // Returns encoding of in-memory representation of the document - // (same as passed to Load or ctor, defaults to UTF-8). - // NB: this is meaningless in Unicode build where data are stored as wchar_t* - wxString GetEncoding() const { return m_encoding; } - void SetEncoding(const wxString& enc) { m_encoding = enc; } -#endif - -private: - wxString m_version; - wxString m_fileEncoding; -#if !wxUSE_UNICODE - wxString m_encoding; -#endif - wxXmlNode *m_root; - - void DoCopy(const wxXmlDocument& doc); -}; - -#endif // _WX_XML_H_ diff --git a/contrib/include/wx/xrc/xmlres.h b/contrib/include/wx/xrc/xmlres.h index ae2179808e..d8b9641aea 100644 --- a/contrib/include/wx/xrc/xmlres.h +++ b/contrib/include/wx/xrc/xmlres.h @@ -26,7 +26,15 @@ #include "wx/icon.h" #include "wx/artprov.h" -#include "wx/xrc/xml.h" +#include "wx/xml/xml.h" + +#ifdef WXMAKINGDLL_XRC + #define WXDLLIMPEXP_XRC WXEXPORT +#elif defined(WXUSINGDLL) + #define WXDLLIMPEXP_XRC WXIMPORT +#else // not making nor using DLL + #define WXDLLIMPEXP_XRC +#endif class WXDLLEXPORT wxMenu; class WXDLLEXPORT wxMenuBar; diff --git a/include/wx/xrc/xml.h b/include/wx/xrc/xml.h deleted file mode 100644 index c65d1364ff..0000000000 --- a/include/wx/xrc/xml.h +++ /dev/null @@ -1,226 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: xml.h -// Purpose: wxXmlDocument - XML parser & data holder class -// Author: Vaclav Slavik -// Created: 2000/03/05 -// RCS-ID: $Id$ -// Copyright: (c) 2000 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_XML_H_ -#define _WX_XML_H_ - -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "xml.h" -#endif - -#include "wx/defs.h" -#include "wx/string.h" -#include "wx/object.h" -#include "wx/list.h" - -#ifdef WXMAKINGDLL_XRC - #define WXDLLIMPEXP_XRC WXEXPORT -#elif defined(WXUSINGDLL) - #define WXDLLIMPEXP_XRC WXIMPORT -#else // not making nor using DLL - #define WXDLLIMPEXP_XRC -#endif - -class WXDLLIMPEXP_XRC wxXmlNode; -class WXDLLIMPEXP_XRC wxXmlProperty; -class WXDLLIMPEXP_XRC wxXmlDocument; -class WXDLLIMPEXP_XRC wxXmlIOHandler; -class WXDLLEXPORT wxInputStream; -class WXDLLEXPORT wxOutputStream; - - -// Represents XML node type. -enum wxXmlNodeType -{ - // note: values are synchronized with xmlElementType from libxml - wxXML_ELEMENT_NODE = 1, - wxXML_ATTRIBUTE_NODE = 2, - wxXML_TEXT_NODE = 3, - wxXML_CDATA_SECTION_NODE = 4, - wxXML_ENTITY_REF_NODE = 5, - wxXML_ENTITY_NODE = 6, - wxXML_PI_NODE = 7, - wxXML_COMMENT_NODE = 8, - wxXML_DOCUMENT_NODE = 9, - wxXML_DOCUMENT_TYPE_NODE = 10, - wxXML_DOCUMENT_FRAG_NODE = 11, - wxXML_NOTATION_NODE = 12, - wxXML_HTML_DOCUMENT_NODE = 13 -}; - - -// Represents node property(ies). -// Example: in "src" is property with value -// "hello.gif" and "id" is prop. with value "3". - -class WXDLLIMPEXP_XRC wxXmlProperty -{ -public: - wxXmlProperty() : m_next(NULL) {} - wxXmlProperty(const wxString& name, const wxString& value, - wxXmlProperty *next) - : m_name(name), m_value(value), m_next(next) {} - - wxString GetName() const { return m_name; } - wxString GetValue() const { return m_value; } - wxXmlProperty *GetNext() const { return m_next; } - - void SetName(const wxString& name) { m_name = name; } - void SetValue(const wxString& value) { m_value = value; } - void SetNext(wxXmlProperty *next) { m_next = next; } - -private: - wxString m_name; - wxString m_value; - wxXmlProperty *m_next; -}; - - - -// Represents node in XML document. Node has name and may have content -// and properties. Most common node types are wxXML_TEXT_NODE (name and props -// are irrelevant) and wxXML_ELEMENT_NODE (e.g. in hi there is -// element with name="title", irrelevant content and one child (wxXML_TEXT_NODE -// with content="hi"). -// -// If wxUSE_UNICODE is 0, all strings are encoded in the encoding given to Load -// (default is UTF-8). - -class WXDLLIMPEXP_XRC wxXmlNode -{ -public: - wxXmlNode() : m_properties(NULL), m_parent(NULL), - m_children(NULL), m_next(NULL) {} - wxXmlNode(wxXmlNode *parent,wxXmlNodeType type, - const wxString& name, const wxString& content, - wxXmlProperty *props, wxXmlNode *next); - ~wxXmlNode(); - - // copy ctor & operator=. Note that this does NOT copy syblings - // and parent pointer, i.e. m_parent and m_next will be NULL - // after using copy ctor and are never unmodified by operator=. - // On the other hand, it DOES copy children and properties. - wxXmlNode(const wxXmlNode& node); - wxXmlNode& operator=(const wxXmlNode& node); - - // user-friendly creation: - wxXmlNode(wxXmlNodeType type, const wxString& name, - const wxString& content = wxEmptyString); - void AddChild(wxXmlNode *child); - void InsertChild(wxXmlNode *child, wxXmlNode *before_node); - bool RemoveChild(wxXmlNode *child); - void AddProperty(const wxString& name, const wxString& value); - bool DeleteProperty(const wxString& name); - - // access methods: - wxXmlNodeType GetType() const { return m_type; } - wxString GetName() const { return m_name; } - wxString GetContent() const { return m_content; } - - wxXmlNode *GetParent() const { return m_parent; } - wxXmlNode *GetNext() const { return m_next; } - wxXmlNode *GetChildren() const { return m_children; } - - wxXmlProperty *GetProperties() const { return m_properties; } - bool GetPropVal(const wxString& propName, wxString *value) const; - wxString GetPropVal(const wxString& propName, - const wxString& defaultVal) const; - bool HasProp(const wxString& propName) const; - - void SetType(wxXmlNodeType type) { m_type = type; } - void SetName(const wxString& name) { m_name = name; } - void SetContent(const wxString& con) { m_content = con; } - - void SetParent(wxXmlNode *parent) { m_parent = parent; } - void SetNext(wxXmlNode *next) { m_next = next; } - void SetChildren(wxXmlNode *child) { m_children = child; } - - void SetProperties(wxXmlProperty *prop) { m_properties = prop; } - void AddProperty(wxXmlProperty *prop); - -private: - wxXmlNodeType m_type; - wxString m_name; - wxString m_content; - wxXmlProperty *m_properties; - wxXmlNode *m_parent, *m_children, *m_next; - - void DoCopy(const wxXmlNode& node); -}; - - - - - - - -// This class holds XML data/document as parsed by XML parser. - -class WXDLLIMPEXP_XRC wxXmlDocument : public wxObject -{ -public: - wxXmlDocument(); - wxXmlDocument(const wxString& filename, - const wxString& encoding = wxT("UTF-8")); - wxXmlDocument(wxInputStream& stream, - const wxString& encoding = wxT("UTF-8")); - ~wxXmlDocument() { delete m_root; } - - wxXmlDocument(const wxXmlDocument& doc); - wxXmlDocument& operator=(const wxXmlDocument& doc); - - // Parses .xml file and loads data. Returns TRUE on success, FALSE - // otherwise. - bool Load(const wxString& filename, - const wxString& encoding = wxT("UTF-8")); - bool Load(wxInputStream& stream, - const wxString& encoding = wxT("UTF-8")); - - // Saves document as .xml file. - bool Save(const wxString& filename) const; - bool Save(wxOutputStream& stream) const; - - bool IsOk() const { return m_root != NULL; } - - // Returns root node of the document. - wxXmlNode *GetRoot() const { return m_root; } - - // Returns version of document (may be empty). - wxString GetVersion() const { return m_version; } - // Returns encoding of document (may be empty). - // Note: this is the encoding original file was saved in, *not* the - // encoding of in-memory representation! - wxString GetFileEncoding() const { return m_fileEncoding; } - - // Write-access methods: - void SetRoot(wxXmlNode *node) { delete m_root ; m_root = node; } - void SetVersion(const wxString& version) { m_version = version; } - void SetFileEncoding(const wxString& encoding) { m_fileEncoding = encoding; } - -#if !wxUSE_UNICODE - // Returns encoding of in-memory representation of the document - // (same as passed to Load or ctor, defaults to UTF-8). - // NB: this is meaningless in Unicode build where data are stored as wchar_t* - wxString GetEncoding() const { return m_encoding; } - void SetEncoding(const wxString& enc) { m_encoding = enc; } -#endif - -private: - wxString m_version; - wxString m_fileEncoding; -#if !wxUSE_UNICODE - wxString m_encoding; -#endif - wxXmlNode *m_root; - - void DoCopy(const wxXmlDocument& doc); -}; - -#endif // _WX_XML_H_ diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index ae2179808e..d8b9641aea 100644 --- a/include/wx/xrc/xmlres.h +++ b/include/wx/xrc/xmlres.h @@ -26,7 +26,15 @@ #include "wx/icon.h" #include "wx/artprov.h" -#include "wx/xrc/xml.h" +#include "wx/xml/xml.h" + +#ifdef WXMAKINGDLL_XRC + #define WXDLLIMPEXP_XRC WXEXPORT +#elif defined(WXUSINGDLL) + #define WXDLLIMPEXP_XRC WXIMPORT +#else // not making nor using DLL + #define WXDLLIMPEXP_XRC +#endif class WXDLLEXPORT wxMenu; class WXDLLEXPORT wxMenuBar; -- 2.45.2