From ad6f7122f6e58694de010d6596416659c7ae07c7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 10 Feb 2006 21:13:41 +0000 Subject: [PATCH] support monolithic build using wxpresets (patch 1360289) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/bakefiles/wxpresets/presets/wx.bkl | 10 +- .../bakefiles/wxpresets/presets/wx_win32.bkl | 103 ++++++++++++++++-- 2 files changed, 102 insertions(+), 11 deletions(-) diff --git a/build/bakefiles/wxpresets/presets/wx.bkl b/build/bakefiles/wxpresets/presets/wx.bkl index 34fb1bbde1..6cbcdbcac0 100644 --- a/build/bakefiles/wxpresets/presets/wx.bkl +++ b/build/bakefiles/wxpresets/presets/wx.bkl @@ -2,14 +2,18 @@ - + + + 2 + 0 diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl index 7bc1cb694a..c349708df3 100644 --- a/build/bakefiles/wxpresets/presets/wx_win32.bkl +++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl @@ -121,6 +121,18 @@ FIXME: this template has (at least) the following bugs: + + 0 + + + + @@ -167,6 +179,76 @@ FIXME: this template has (at least) the following bugs: $(WXLIBPATH)$(DIRSEP)$(WXPORT)$(WXLIBPOSTFIX) + + + wxbase$(WX_VERSION) + wxbase$(WX_VERSION)d + wxbase$(WX_VERSION)u + wxbase$(WX_VERSION)ud + + + wx$(WXPORT)$(WX_VERSION) + wx$(WXPORT)$(WX_VERSION)d + wx$(WXPORT)$(WX_VERSION)u + wx$(WXPORT)$(WX_VERSION)ud + + + + + wxbase$(WX_VERSION)_net + wxbase$(WX_VERSION)d_net + wxbase$(WX_VERSION)u_net + wxbase$(WX_VERSION)ud_net + + + wxbase$(WX_VERSION)_xml + wxbase$(WX_VERSION)d_xml + wxbase$(WX_VERSION)u_xml + wxbase$(WX_VERSION)ud_xml + + + wxbase$(WX_VERSION)_odbc + wxbase$(WX_VERSION)d_odbc + wxbase$(WX_VERSION)u_odbc + wxbase$(WX_VERSION)ud_odbc + + + + + wx$(WXPORT)$(WX_VERSION)_core + wx$(WXPORT)$(WX_VERSION)d_core + wx$(WXPORT)$(WX_VERSION)u_core + wx$(WXPORT)$(WX_VERSION)ud_core + + + wx$(WXPORT)$(WX_VERSION)_xrc + wx$(WXPORT)$(WX_VERSION)d_xrc + wx$(WXPORT)$(WX_VERSION)u_xrc + wx$(WXPORT)$(WX_VERSION)ud_xrc + + + wx$(WXPORT)$(WX_VERSION)_html + wx$(WXPORT)$(WX_VERSION)d_html + wx$(WXPORT)$(WX_VERSION)u_html + wx$(WXPORT)$(WX_VERSION)ud_html + + + wx$(WXPORT)$(WX_VERSION)_adv + wx$(WXPORT)$(WX_VERSION)d_adv + wx$(WXPORT)$(WX_VERSION)u_adv + wx$(WXPORT)$(WX_VERSION)ud_adv + + + + + + + @@ -189,14 +271,19 @@ FIXME: this template has (at least) the following bugs: - - wxbase$(WX_VERSION)$(WXLIBPOSTFIX) - - - wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) - - - wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) + $(WXLIB_BASE_NAME) + $(WXLIB_CORE_NAME) + + $(WXLIB_NET_NAME) + $(WXLIB_XML_NAME) + $(WXLIB_ODBC_NAME) + + $(WXLIB_XRC_NAME) + $(WXLIB_HTML_NAME) + $(WXLIB_ADV_NAME) + + + Unknown wxWidgets library given in the wx-lib tag -- 2.45.2