Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
Download Patch File Download Diff File Expand all files Collapse all 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