changed wxXML to XRC, wx/xml/*.h->wx/xrc/*.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/wxrc/Makefile.in

@@ -9,7 +9,7 @@ PROGRAM=wxrc
 OBJECTS=wxrc.o
 
 
-APPEXTRALIBS=$(top_builddir)/lib/libwxxml.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/libwxxrc.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

utils/wxrc/makefile.b32

@@ -10,7 +10,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=wxrc
-EXTRALIBS=$(WXDIR)\lib\wxxml.lib
+EXTRALIBS=$(WXDIR)\lib\wxxrc.lib
 OBJECTS = $(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.b32

utils/wxrc/makefile.g95

@@ -10,7 +10,7 @@
 WXDIR = ../../..
 
 TARGET=wxrc
-EXTRALIBS=-lwxxml
+EXTRALIBS=-lwxxrc
 OBJECTS = $(TARGET).o
 
 include $(WXDIR)/src/makeprog.g95

utils/wxrc/makefile.vc

@@ -18,15 +18,15 @@ PROGRAM=wxrc
 FINAL=0
 
 !if "$(FINAL)" == "0"
-EXTRALIBS=$(WXDIR)\lib\wxxmld.lib
+EXTRALIBS=$(WXDIR)\lib\wxxrcd.lib
 !endif
 
 !if "$(FINAL)" == "1"
-EXTRALIBS=$(WXDIR)\lib\wxxml.lib
+EXTRALIBS=$(WXDIR)\lib\wxxrc.lib
 !endif
 
 !if "$(FINAL)" == "hybrid"
-EXTRALIBS=$(WXDIR)\lib\wxxmlh.lib
+EXTRALIBS=$(WXDIR)\lib\wxxrch.lib
 !endif
 
 

utils/wxrc/makefile.wat

@@ -6,7 +6,7 @@
 WXDIR = $(%WXWIN)
 
 PROGRAM = wxrc
-EXTRALIBS = $(WXDIR)\lib\wxxml.lib
+EXTRALIBS = $(WXDIR)\lib\wxxrc.lib
 OBJECTS = $(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.wat

utils/wxrc/wxrc.cpp

@@ -27,8 +27,8 @@
 #endif
 
 #include "wx/cmdline.h"
-#include "wx/xml/xml.h"
-#include "wx/xml/xmlio.h"
+#include "wx/xrc/xml.h"
+#include "wx/xrc/xmlio.h"
 #include "wx/ffile.h"
 #include "wx/wfstream.h"
 
@@ -358,8 +358,8 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist)
 \
 #include \"wx/filesys.h\"\n\
 #include \"wx/fs_mem.h\"\n\
-#include \"wx/xml/xmlres.h\"\n\
-#include \"wx/xml/xh_all.h\"\n\
+#include \"wx/xrc/xmlres.h\"\n\
+#include \"wx/xrc/xh_all.h\"\n\
 \n");
 
     for (i = 0; i < flist.Count(); i++)