AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

extract parts of wxXRC depending on wxAdv in a separate file to allow statically linking with wxXRC but without wxAdv; note that rebaked project/make files also contain ustring.cpp/h now

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-08-02 14:15:22 +00:00
parent 8e69bf8e84
commit aaa0312528
17 changed files with 251 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.in
View File

@ -1541,6 +1541,7 @@ XRCDLL_OBJECTS = \
xrcdll_xh_unkwn.o \
xrcdll_xh_wizrd.o \
xrcdll_xmlres.o \
xrcdll_xmladv.o \
xrcdll_xmlrsall.o
XRCDLL_ODEP = $(___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname)
XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
@ -1605,6 +1606,7 @@ XRCLIB_OBJECTS = \
xrclib_xh_unkwn.o \
xrclib_xh_wizrd.o \
xrclib_xmlres.o \
xrclib_xmladv.o \
xrclib_xmlrsall.o
XRCLIB_ODEP = $(___pch_wxprec_xrclib_wx_wxprec_h_gch___depname)
AUIDLL_CXXFLAGS = $(__auidll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
@ -3798,6 +3800,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \
monodll_xh_unkwn.o \
monodll_xh_wizrd.o \
monodll_xmlres.o \
monodll_xmladv.o \
monodll_xmlrsall.o \
monodll_framemanager.o \
monodll_dockart.o \
@ -5695,6 +5698,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \
monolib_xh_unkwn.o \
monolib_xh_wizrd.o \
monolib_xmlres.o \
monolib_xmladv.o \
monolib_xmlrsall.o \
monolib_framemanager.o \
monolib_dockart.o \
@ -14323,6 +14327,9 @@ monodll_xh_wizrd.o: $(srcdir)/src/xrc/xh_wizrd.cpp $(MONODLL_ODEP)
monodll_xmlres.o: $(srcdir)/src/xrc/xmlres.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmlres.cpp
monodll_xmladv.o: $(srcdir)/src/xrc/xmladv.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmladv.cpp
monodll_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
@ -18808,6 +18815,9 @@ monolib_xh_wizrd.o: $(srcdir)/src/xrc/xh_wizrd.cpp $(MONOLIB_ODEP)
monolib_xmlres.o: $(srcdir)/src/xrc/xmlres.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlres.cpp
monolib_xmladv.o: $(srcdir)/src/xrc/xmladv.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xmladv.cpp
monolib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
@ -31291,6 +31301,9 @@ xrcdll_xh_wizrd.o: $(srcdir)/src/xrc/xh_wizrd.cpp $(XRCDLL_ODEP)
xrcdll_xmlres.o: $(srcdir)/src/xrc/xmlres.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xmlres.cpp
xrcdll_xmladv.o: $(srcdir)/src/xrc/xmladv.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xmladv.cpp
xrcdll_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
@ -31462,6 +31475,9 @@ xrclib_xh_wizrd.o: $(srcdir)/src/xrc/xh_wizrd.cpp $(XRCLIB_ODEP)
xrclib_xmlres.o: $(srcdir)/src/xrc/xmlres.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlres.cpp
xrclib_xmladv.o: $(srcdir)/src/xrc/xmladv.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmladv.cpp
xrclib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp

1
build/bakefiles/files.bkl
View File

@ -3176,6 +3176,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/xrc/xh_unkwn.cpp
src/xrc/xh_wizrd.cpp
src/xrc/xmlres.cpp
src/xrc/xmladv.cpp
src/xrc/xmlrsall.cpp
</set>
<set var="XRC_HDR" hints="files">

32
build/msw/makefile.bcc
View File

@ -373,6 +373,7 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_txtstrm.obj \
$(OBJS)\monodll_unichar.obj \
$(OBJS)\monodll_uri.obj \
$(OBJS)\monodll_ustring.obj \
$(OBJS)\monodll_variant.obj \
$(OBJS)\monodll_wfstream.obj \
$(OBJS)\monodll_wxcrt.obj \
@ -511,6 +512,7 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_txtstrm.obj \
$(OBJS)\monolib_unichar.obj \
$(OBJS)\monolib_uri.obj \
$(OBJS)\monolib_ustring.obj \
$(OBJS)\monolib_variant.obj \
$(OBJS)\monolib_wfstream.obj \
$(OBJS)\monolib_wxcrt.obj \
@ -646,6 +648,7 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_txtstrm.obj \
$(OBJS)\basedll_unichar.obj \
$(OBJS)\basedll_uri.obj \
$(OBJS)\basedll_ustring.obj \
$(OBJS)\basedll_variant.obj \
$(OBJS)\basedll_wfstream.obj \
$(OBJS)\basedll_wxcrt.obj \
@ -765,6 +768,7 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_txtstrm.obj \
$(OBJS)\baselib_unichar.obj \
$(OBJS)\baselib_uri.obj \
$(OBJS)\baselib_ustring.obj \
$(OBJS)\baselib_variant.obj \
$(OBJS)\baselib_wfstream.obj \
$(OBJS)\baselib_wxcrt.obj \
@ -1117,6 +1121,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_unkwn.obj \
$(OBJS)\xrcdll_xh_wizrd.obj \
$(OBJS)\xrcdll_xmlres.obj \
$(OBJS)\xrcdll_xmladv.obj \
$(OBJS)\xrcdll_xmlrsall.obj
XRCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
@ -1184,6 +1189,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_unkwn.obj \
$(OBJS)\xrclib_xh_wizrd.obj \
$(OBJS)\xrclib_xmlres.obj \
$(OBJS)\xrclib_xmladv.obj \
$(OBJS)\xrclib_xmlrsall.obj
AUIDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
@ -1453,6 +1459,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_unkwn.obj \
$(OBJS)\monodll_xh_wizrd.obj \
$(OBJS)\monodll_xmlres.obj \
$(OBJS)\monodll_xmladv.obj \
$(OBJS)\monodll_xmlrsall.obj \
$(OBJS)\monodll_framemanager.obj \
$(OBJS)\monodll_dockart.obj \
@ -2108,6 +2115,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_unkwn.obj \
$(OBJS)\monolib_xh_wizrd.obj \
$(OBJS)\monolib_xmlres.obj \
$(OBJS)\monolib_xmladv.obj \
$(OBJS)\monolib_xmlrsall.obj \
$(OBJS)\monolib_framemanager.obj \
$(OBJS)\monolib_dockart.obj \
@ -5427,6 +5435,9 @@ $(OBJS)\monodll_unichar.obj: ..\..\src\common\unichar.cpp
$(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\uri.cpp
$(OBJS)\monodll_ustring.obj: ..\..\src\common\ustring.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ustring.cpp
$(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\variant.cpp
@ -5970,6 +5981,9 @@ $(OBJS)\monodll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
$(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
$(OBJS)\monodll_xmladv.obj: ..\..\src\xrc\xmladv.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
$(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
@ -7577,6 +7591,9 @@ $(OBJS)\monolib_unichar.obj: ..\..\src\common\unichar.cpp
$(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\uri.cpp
$(OBJS)\monolib_ustring.obj: ..\..\src\common\ustring.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ustring.cpp
$(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\variant.cpp
@ -8120,6 +8137,9 @@ $(OBJS)\monolib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
$(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
$(OBJS)\monolib_xmladv.obj: ..\..\src\xrc\xmladv.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
$(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
@ -9727,6 +9747,9 @@ $(OBJS)\basedll_unichar.obj: ..\..\src\common\unichar.cpp
$(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\uri.cpp
$(OBJS)\basedll_ustring.obj: ..\..\src\common\ustring.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ustring.cpp
$(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\variant.cpp
@ -10033,6 +10056,9 @@ $(OBJS)\baselib_unichar.obj: ..\..\src\common\unichar.cpp
$(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\uri.cpp
$(OBJS)\baselib_ustring.obj: ..\..\src\common\ustring.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ustring.cpp
$(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\variant.cpp
@ -13534,6 +13560,9 @@ $(OBJS)\xrcdll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
$(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrcdll_xmladv.obj: ..\..\src\xrc\xmladv.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
$(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
@ -13708,6 +13737,9 @@ $(OBJS)\xrclib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
$(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrclib_xmladv.obj: ..\..\src\xrc\xmladv.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp

32
build/msw/makefile.gcc
View File

@ -360,6 +360,7 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_txtstrm.o \
$(OBJS)\monodll_unichar.o \
$(OBJS)\monodll_uri.o \
$(OBJS)\monodll_ustring.o \
$(OBJS)\monodll_variant.o \
$(OBJS)\monodll_wfstream.o \
$(OBJS)\monodll_wxcrt.o \
@ -499,6 +500,7 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_txtstrm.o \
$(OBJS)\monolib_unichar.o \
$(OBJS)\monolib_uri.o \
$(OBJS)\monolib_ustring.o \
$(OBJS)\monolib_variant.o \
$(OBJS)\monolib_wfstream.o \
$(OBJS)\monolib_wxcrt.o \
@ -636,6 +638,7 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_txtstrm.o \
$(OBJS)\basedll_unichar.o \
$(OBJS)\basedll_uri.o \
$(OBJS)\basedll_ustring.o \
$(OBJS)\basedll_variant.o \
$(OBJS)\basedll_wfstream.o \
$(OBJS)\basedll_wxcrt.o \
@ -755,6 +758,7 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_txtstrm.o \
$(OBJS)\baselib_unichar.o \
$(OBJS)\baselib_uri.o \
$(OBJS)\baselib_ustring.o \
$(OBJS)\baselib_variant.o \
$(OBJS)\baselib_wfstream.o \
$(OBJS)\baselib_wxcrt.o \
@ -1120,6 +1124,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_unkwn.o \
$(OBJS)\xrcdll_xh_wizrd.o \
$(OBJS)\xrcdll_xmlres.o \
$(OBJS)\xrcdll_xmladv.o \
$(OBJS)\xrcdll_xmlrsall.o
XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
@ -1187,6 +1192,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_unkwn.o \
$(OBJS)\xrclib_xh_wizrd.o \
$(OBJS)\xrclib_xmlres.o \
$(OBJS)\xrclib_xmladv.o \
$(OBJS)\xrclib_xmlrsall.o
AUIDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
@ -1469,6 +1475,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_unkwn.o \
$(OBJS)\monodll_xh_wizrd.o \
$(OBJS)\monodll_xmlres.o \
$(OBJS)\monodll_xmladv.o \
$(OBJS)\monodll_xmlrsall.o \
$(OBJS)\monodll_framemanager.o \
$(OBJS)\monodll_dockart.o \
@ -2130,6 +2137,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_unkwn.o \
$(OBJS)\monolib_xh_wizrd.o \
$(OBJS)\monolib_xmlres.o \
$(OBJS)\monolib_xmladv.o \
$(OBJS)\monolib_xmlrsall.o \
$(OBJS)\monolib_framemanager.o \
$(OBJS)\monolib_dockart.o \
@ -5569,6 +5577,9 @@ $(OBJS)\monodll_unichar.o: ../../src/common/unichar.cpp
$(OBJS)\monodll_uri.o: ../../src/common/uri.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_ustring.o: ../../src/common/ustring.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_variant.o: ../../src/common/variant.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@ -6112,6 +6123,9 @@ $(OBJS)\monodll_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp
$(OBJS)\monodll_xmlres.o: ../../src/xrc/xmlres.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xmladv.o: ../../src/xrc/xmladv.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@ -7833,6 +7847,9 @@ $(OBJS)\monolib_unichar.o: ../../src/common/unichar.cpp
$(OBJS)\monolib_uri.o: ../../src/common/uri.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_ustring.o: ../../src/common/ustring.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_variant.o: ../../src/common/variant.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@ -8376,6 +8393,9 @@ $(OBJS)\monolib_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp
$(OBJS)\monolib_xmlres.o: ../../src/xrc/xmlres.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xmladv.o: ../../src/xrc/xmladv.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@ -10097,6 +10117,9 @@ $(OBJS)\basedll_unichar.o: ../../src/common/unichar.cpp
$(OBJS)\basedll_uri.o: ../../src/common/uri.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_ustring.o: ../../src/common/ustring.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_variant.o: ../../src/common/variant.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
@ -10403,6 +10426,9 @@ $(OBJS)\baselib_unichar.o: ../../src/common/unichar.cpp
$(OBJS)\baselib_uri.o: ../../src/common/uri.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_ustring.o: ../../src/common/ustring.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_variant.o: ../../src/common/variant.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
@ -14128,6 +14154,9 @@ $(OBJS)\xrcdll_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp
$(OBJS)\xrcdll_xmlres.o: ../../src/xrc/xmlres.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_xmladv.o: ../../src/xrc/xmladv.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
@ -14302,6 +14331,9 @@ $(OBJS)\xrclib_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp
$(OBJS)\xrclib_xmlres.o: ../../src/xrc/xmlres.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xmladv.o: ../../src/xrc/xmladv.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<

32
build/msw/makefile.vc
View File

@ -375,6 +375,7 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_txtstrm.obj \
$(OBJS)\monodll_unichar.obj \
$(OBJS)\monodll_uri.obj \
$(OBJS)\monodll_ustring.obj \
$(OBJS)\monodll_variant.obj \
$(OBJS)\monodll_wfstream.obj \
$(OBJS)\monodll_wxcrt.obj \
@ -518,6 +519,7 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_txtstrm.obj \
$(OBJS)\monolib_unichar.obj \
$(OBJS)\monolib_uri.obj \
$(OBJS)\monolib_ustring.obj \
$(OBJS)\monolib_variant.obj \
$(OBJS)\monolib_wfstream.obj \
$(OBJS)\monolib_wxcrt.obj \
@ -659,6 +661,7 @@ BASEDLL_OBJECTS = \
$(OBJS)\basedll_txtstrm.obj \
$(OBJS)\basedll_unichar.obj \
$(OBJS)\basedll_uri.obj \
$(OBJS)\basedll_ustring.obj \
$(OBJS)\basedll_variant.obj \
$(OBJS)\basedll_wfstream.obj \
$(OBJS)\basedll_wxcrt.obj \
@ -783,6 +786,7 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_txtstrm.obj \
$(OBJS)\baselib_unichar.obj \
$(OBJS)\baselib_uri.obj \
$(OBJS)\baselib_ustring.obj \
$(OBJS)\baselib_variant.obj \
$(OBJS)\baselib_wfstream.obj \
$(OBJS)\baselib_wxcrt.obj \
@ -1188,6 +1192,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_unkwn.obj \
$(OBJS)\xrcdll_xh_wizrd.obj \
$(OBJS)\xrcdll_xmlres.obj \
$(OBJS)\xrcdll_xmladv.obj \
$(OBJS)\xrcdll_xmlrsall.obj
XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_356)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) \
@ -1258,6 +1263,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_unkwn.obj \
$(OBJS)\xrclib_xh_wizrd.obj \
$(OBJS)\xrclib_xmlres.obj \
$(OBJS)\xrclib_xmladv.obj \
$(OBJS)\xrclib_xmlrsall.obj
AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_370)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) \
@ -1627,6 +1633,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_unkwn.obj \
$(OBJS)\monodll_xh_wizrd.obj \
$(OBJS)\monodll_xmlres.obj \
$(OBJS)\monodll_xmladv.obj \
$(OBJS)\monodll_xmlrsall.obj \
$(OBJS)\monodll_framemanager.obj \
$(OBJS)\monodll_dockart.obj \
@ -2288,6 +2295,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_unkwn.obj \
$(OBJS)\monolib_xh_wizrd.obj \
$(OBJS)\monolib_xmlres.obj \
$(OBJS)\monolib_xmladv.obj \
$(OBJS)\monolib_xmlrsall.obj \
$(OBJS)\monolib_framemanager.obj \
$(OBJS)\monolib_dockart.obj \
@ -5759,6 +5767,9 @@ $(OBJS)\monodll_unichar.obj: ..\..\src\common\unichar.cpp
$(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\uri.cpp
$(OBJS)\monodll_ustring.obj: ..\..\src\common\ustring.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ustring.cpp
$(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\variant.cpp
@ -6302,6 +6313,9 @@ $(OBJS)\monodll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
$(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
$(OBJS)\monodll_xmladv.obj: ..\..\src\xrc\xmladv.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
$(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
@ -7909,6 +7923,9 @@ $(OBJS)\monolib_unichar.obj: ..\..\src\common\unichar.cpp
$(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\uri.cpp
$(OBJS)\monolib_ustring.obj: ..\..\src\common\ustring.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ustring.cpp
$(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\variant.cpp
@ -8452,6 +8469,9 @@ $(OBJS)\monolib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
$(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
$(OBJS)\monolib_xmladv.obj: ..\..\src\xrc\xmladv.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
$(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
@ -10059,6 +10079,9 @@ $(OBJS)\basedll_unichar.obj: ..\..\src\common\unichar.cpp
$(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\uri.cpp
$(OBJS)\basedll_ustring.obj: ..\..\src\common\ustring.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ustring.cpp
$(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\variant.cpp
@ -10365,6 +10388,9 @@ $(OBJS)\baselib_unichar.obj: ..\..\src\common\unichar.cpp
$(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\uri.cpp
$(OBJS)\baselib_ustring.obj: ..\..\src\common\ustring.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ustring.cpp
$(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\variant.cpp
@ -13866,6 +13892,9 @@ $(OBJS)\xrcdll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
$(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrcdll_xmladv.obj: ..\..\src\xrc\xmladv.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
$(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
@ -14040,6 +14069,9 @@ $(OBJS)\xrclib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
$(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrclib_xmladv.obj: ..\..\src\xrc\xmladv.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp

32
build/msw/makefile.wat
View File

@ -187,6 +187,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_xh_unkwn.obj &
$(OBJS)\monodll_xh_wizrd.obj &
$(OBJS)\monodll_xmlres.obj &
$(OBJS)\monodll_xmladv.obj &
$(OBJS)\monodll_xmlrsall.obj &
$(OBJS)\monodll_framemanager.obj &
$(OBJS)\monodll_dockart.obj &
@ -853,6 +854,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_xh_unkwn.obj &
$(OBJS)\monolib_xh_wizrd.obj &
$(OBJS)\monolib_xmlres.obj &
$(OBJS)\monolib_xmladv.obj &
$(OBJS)\monolib_xmlrsall.obj &
$(OBJS)\monolib_framemanager.obj &
$(OBJS)\monolib_dockart.obj &
@ -3358,6 +3360,7 @@ MONODLL_OBJECTS = &
$(OBJS)\monodll_txtstrm.obj &
$(OBJS)\monodll_unichar.obj &
$(OBJS)\monodll_uri.obj &
$(OBJS)\monodll_ustring.obj &
$(OBJS)\monodll_variant.obj &
$(OBJS)\monodll_wfstream.obj &
$(OBJS)\monodll_wxcrt.obj &
@ -3496,6 +3499,7 @@ MONOLIB_OBJECTS = &
$(OBJS)\monolib_txtstrm.obj &
$(OBJS)\monolib_unichar.obj &
$(OBJS)\monolib_uri.obj &
$(OBJS)\monolib_ustring.obj &
$(OBJS)\monolib_variant.obj &
$(OBJS)\monolib_wfstream.obj &
$(OBJS)\monolib_wxcrt.obj &
@ -3632,6 +3636,7 @@ BASEDLL_OBJECTS = &
$(OBJS)\basedll_txtstrm.obj &
$(OBJS)\basedll_unichar.obj &
$(OBJS)\basedll_uri.obj &
$(OBJS)\basedll_ustring.obj &
$(OBJS)\basedll_variant.obj &
$(OBJS)\basedll_wfstream.obj &
$(OBJS)\basedll_wxcrt.obj &
@ -3751,6 +3756,7 @@ BASELIB_OBJECTS = &
$(OBJS)\baselib_txtstrm.obj &
$(OBJS)\baselib_unichar.obj &
$(OBJS)\baselib_uri.obj &
$(OBJS)\baselib_ustring.obj &
$(OBJS)\baselib_variant.obj &
$(OBJS)\baselib_wfstream.obj &
$(OBJS)\baselib_wxcrt.obj &
@ -4111,6 +4117,7 @@ XRCDLL_OBJECTS = &
$(OBJS)\xrcdll_xh_unkwn.obj &
$(OBJS)\xrcdll_xh_wizrd.obj &
$(OBJS)\xrcdll_xmlres.obj &
$(OBJS)\xrcdll_xmladv.obj &
$(OBJS)\xrcdll_xmlrsall.obj
XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
@ -4178,6 +4185,7 @@ XRCLIB_OBJECTS = &
$(OBJS)\xrclib_xh_unkwn.obj &
$(OBJS)\xrclib_xh_wizrd.obj &
$(OBJS)\xrclib_xmlres.obj &
$(OBJS)\xrclib_xmladv.obj &
$(OBJS)\xrclib_xmlrsall.obj
AUIDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
@ -5801,6 +5809,9 @@ $(OBJS)\monodll_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp
$(OBJS)\monodll_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_ustring.obj : .AUTODEPEND ..\..\src\common\ustring.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@ -6344,6 +6355,9 @@ $(OBJS)\monodll_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp
$(OBJS)\monodll_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xmladv.obj : .AUTODEPEND ..\..\src\xrc\xmladv.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@ -8065,6 +8079,9 @@ $(OBJS)\monolib_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp
$(OBJS)\monolib_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_ustring.obj : .AUTODEPEND ..\..\src\common\ustring.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@ -8608,6 +8625,9 @@ $(OBJS)\monolib_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp
$(OBJS)\monolib_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xmladv.obj : .AUTODEPEND ..\..\src\xrc\xmladv.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@ -10329,6 +10349,9 @@ $(OBJS)\basedll_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp
$(OBJS)\basedll_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_ustring.obj : .AUTODEPEND ..\..\src\common\ustring.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
@ -10635,6 +10658,9 @@ $(OBJS)\baselib_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp
$(OBJS)\baselib_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_ustring.obj : .AUTODEPEND ..\..\src\common\ustring.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
@ -14360,6 +14386,9 @@ $(OBJS)\xrcdll_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp
$(OBJS)\xrcdll_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
$(OBJS)\xrcdll_xmladv.obj : .AUTODEPEND ..\..\src\xrc\xmladv.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
$(OBJS)\xrcdll_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
@ -14534,6 +14563,9 @@ $(OBJS)\xrclib_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp
$(OBJS)\xrclib_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
$(OBJS)\xrclib_xmladv.obj : .AUTODEPEND ..\..\src\xrc\xmladv.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
$(OBJS)\xrclib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<

8
build/msw/wx_base.dsp
View File

@ -531,6 +531,10 @@ SOURCE=..\..\src\common\uri.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\ustring.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\utilscmn.cpp
# End Source File
# Begin Source File
@ -1459,6 +1463,10 @@ SOURCE=..\..\include\wx\uri.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\ustring.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\utils.h
# End Source File
# Begin Source File

4
build/msw/wx_vc7_base.vcproj
View File

@ -824,6 +824,8 @@
RelativePath="..\..\src\common\unichar.cpp"/>
<File
RelativePath="..\..\src\common\uri.cpp"/>
<File
RelativePath="..\..\src\common\ustring.cpp"/>
<File
RelativePath="..\..\src\common\utilscmn.cpp"/>
<File
@ -1350,6 +1352,8 @@
RelativePath="..\..\include\wx\unichar.h"/>
<File
RelativePath="..\..\include\wx\uri.h"/>
<File
RelativePath="..\..\include\wx\ustring.h"/>
<File
RelativePath="..\..\include\wx\utils.h"/>
<File

2
build/msw/wx_vc7_xrc.vcproj
View File

@ -1064,6 +1064,8 @@
RelativePath="..\..\src\xrc\xh_unkwn.cpp"/>
<File
RelativePath="..\..\src\xrc\xh_wizrd.cpp"/>
<File
RelativePath="..\..\src\xrc\xmladv.cpp"/>
<File
RelativePath="..\..\src\xrc\xmlres.cpp"/>
<File

6
build/msw/wx_vc8_base.vcproj
View File

@ -1065,6 +1065,9 @@
<File
RelativePath="..\..\src\common\uri.cpp"
/>
<File
RelativePath="..\..\src\common\ustring.cpp"
/>
<File
RelativePath="..\..\src\common\utilscmn.cpp"
/>
@ -1805,6 +1808,9 @@
<File
RelativePath="..\..\include\wx\uri.h"
/>
<File
RelativePath="..\..\include\wx\ustring.h"
/>
<File
RelativePath="..\..\include\wx\utils.h"
/>

3
build/msw/wx_vc8_xrc.vcproj
View File

@ -1384,6 +1384,9 @@
<File
RelativePath="..\..\src\xrc\xh_wizrd.cpp"
/>
<File
RelativePath="..\..\src\xrc\xmladv.cpp"
/>
<File
RelativePath="..\..\src\xrc\xmlres.cpp"
/>

4
build/msw/wx_xrc.dsp
View File

@ -982,6 +982,10 @@ SOURCE=..\..\src\xrc\xh_wizrd.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\xrc\xmladv.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\xrc\xmlres.cpp
# End Source File
# Begin Source File

76
src/xrc/xmladv.cpp Normal file
View File

@ -0,0 +1,76 @@
///////////////////////////////////////////////////////////////////////////////
// Name: src/xrc/xmladv.cpp
// Purpose: Parts of wxXRC library depending on wxAdv: they must not be in
// xmlres.cpp itself or it becomes impossible to use wxXRC without
// linking wxAdv even if the latter is not used at all.
// Author: Vadim Zeitlin (extracted from src/xrc/xmlres.cpp)
// Created: 2008-08-02
// RCS-ID: $Id$
// Copyright: (c) 2000 Vaclav Slavik
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_XRC
#include "wx/xrc/xmlres.h"
#ifndef WX_PRECOMP
#include "wx/string.h"
#endif // WX_PRECOMP
// ============================================================================
// implementation
// ============================================================================
#if wxUSE_ANIMATIONCTRL
wxAnimation wxXmlResourceHandler::GetAnimation(const wxString& param)
{
const wxString name = GetParamValue(param);
if ( name.empty() )
return wxNullAnimation;
// load the animation from file
wxAnimation ani;
#if wxUSE_FILESYSTEM
wxFSFile * const
fsfile = GetCurFileSystem().OpenFile(name, wxFS_READ | wxFS_SEEKABLE);
if ( fsfile )
{
ani.Load(*fsfile->GetStream());
delete fsfile;
}
#else
ani.LoadFile(name);
#endif
if ( !ani.IsOk() )
{
wxLogError(_("XRC resource: Cannot create animation from '%s'."),
name.c_str());
return wxNullAnimation;
}
return ani;
}
#endif // wxUSE_ANIMATIONCTRL
#endif // wxUSE_XRC

34
src/xrc/xmlres.cpp
View File

@ -1170,40 +1170,6 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
return wxBitmap(img);
}
#if wxUSE_ANIMATIONCTRL
wxAnimation wxXmlResourceHandler::GetAnimation(const wxString& param)
{
wxAnimation ani;
/* load the animation from file: */
wxString name = GetParamValue(param);
if (name.empty()) return wxNullAnimation;
#if wxUSE_FILESYSTEM
wxFSFile *fsfile = GetCurFileSystem().OpenFile(name, wxFS_READ | wxFS_SEEKABLE);
if (fsfile == NULL)
{
wxLogError(_("XRC resource: Cannot create animation from '%s'."),
name.c_str());
return wxNullAnimation;
}
ani.Load(*(fsfile->GetStream()));
delete fsfile;
#else
ani.LoadFile(name);
#endif
if (!ani.IsOk())
{
wxLogError(_("XRC resource: Cannot create animation from '%s'."),
name.c_str());
return wxNullAnimation;
}
return ani;
}
#endif // wxUSE_ANIMATIONCTRL
wxIcon wxXmlResourceHandler::GetIcon(const wxString& param,
const wxArtClient& defaultArtClient,

1
wxGTK.spec
View File

@ -314,6 +314,7 @@ wx/txtstrm.h
wx/types.h
wx/unichar.h
wx/uri.h
wx/ustring.h
wx/utils.h
wx/variant.h
wx/vector.h

1
wxMotif.spec
View File

@ -219,6 +219,7 @@ wx/txtstrm.h
wx/types.h
wx/unichar.h
wx/uri.h
wx/ustring.h
wx/utils.h
wx/variant.h
wx/vector.h

1
wxX11.spec
View File

@ -243,6 +243,7 @@ wx/txtstrm.h
wx/types.h
wx/unichar.h
wx/uri.h
wx/ustring.h
wx/utils.h
wx/variant.h
wx/vector.h