X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d65cbb3788e6df967214854de6d0a796b607e7ca..ec6278a141efa26e6a84fc9f27ab4685c8b0333b:/build/bakefiles/wxpresets/presets/wx_win32.bkl diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl index 39b4e57820..b056dc2223 100644 --- a/build/bakefiles/wxpresets/presets/wx_win32.bkl +++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl @@ -82,10 +82,7 @@ - wxbase$(WX_VERSION) - wxbase$(WX_VERSION)d - wxbase$(WX_VERSION)u - wxbase$(WX_VERSION)ud + wxbase$(WX_VERSION)$(WXLIBPOSTFIX) - wx$(WX_PORT)$(WX_VERSION) - wx$(WX_PORT)$(WX_VERSION)d - wx$(WX_PORT)$(WX_VERSION)u - wx$(WX_PORT)$(WX_VERSION)ud + wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX) - - wxbase$(WX_VERSION)_$(value) - - - wxbase$(WX_VERSION)d_$(value) - - - wxbase$(WX_VERSION)u_$(value) - - - wxbase$(WX_VERSION)ud_$(value) + + wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) net xml - odbc - - wx$(WX_PORT)$(WX_VERSION)_$(value) - - - wx$(WX_PORT)$(WX_VERSION)d_$(value) - - - wx$(WX_PORT)$(WX_VERSION)u_$(value) - - - wx$(WX_PORT)$(WX_VERSION)ud_$(value) + + wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) @@ -147,12 +122,12 @@ html adv qa - dbgrid - gl aui + propgrid + stc richtext - + @@ -181,25 +156,29 @@ $(WXLIB_NET_NAME) $(WXLIB_XML_NAME) - $(WXLIB_ODBC_NAME) $(WXLIB_MEDIA_NAME) $(WXLIB_XRC_NAME) $(WXLIB_HTML_NAME) $(WXLIB_ADV_NAME) - $(WXLIB_GL_NAME) - $(WXLIB_DBGRID_NAME) $(WXLIB_QA_NAME) $(WXLIB_AUI_NAME) + $(WXLIB_PROPGRID_NAME) $(WXLIB_RICHTEXT_NAME) - - + + wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) - + + + $(WXLIB_STC_NAME) + wxscintilla$(WX3RDPARTYLIBPOSTFIX) + + + Unknown wxWidgets library given in the wx-lib tag @@ -227,8 +206,10 @@ $(WXDEBUG_DEFINE) __WXMSW__ - $(WX_DIR)$(WXLIBINCLUDE) - $(WX_DIR)/include + + $(WX_DIR)$(WXLIBINCLUDE) + $(WX_DIR)/include + @@ -251,7 +232,6 @@ ole2w32 - odbc32 @@ -270,7 +250,6 @@ rpcrt4 advapi32 wsock32 - odbc32 @@ -281,7 +260,9 @@ - +