X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6cab6476389e2e6ec257daa233d49e8245d8f642..192c3efa7f0ee383ec5e5c12877627d6c20498a7:/build/bakefiles/wxpresets/presets/wx_win32.bkl?ds=sidebyside diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl index fbc2759cc2..4b86018bee 100644 --- a/build/bakefiles/wxpresets/presets/wx_win32.bkl +++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl @@ -10,123 +10,175 @@ - - - - - - - - - - - - - - + - - - - - - + + + 1 + 0 + + + + 1 + 0 + + + 1 + 1 + 0 + + - - - - - - - - - - - + + + + X86 + + + + + + X86 + AMD64 + IA64 + + + + + - - + + _UNICODE - - - - - - __WXDEBUG__ + + + + + + __WXDEBUG__ - + - - ud - d - u - - + d - - $(DIRSEP)lib$(DIRSEP)$(COMPILER)_lib - $(DIRSEP)lib$(DIRSEP)$(COMPILER)_dll + + _$(CPU) + _amd64 + _ia64 - - $(WXLIBPATH)$(DIRSEP)msw$(WXLIBPOSTFIX) + + + /MACHINE:AMD64 + /MACHINE:IA64 + + + $(DIRSEP)lib$(DIRSEP)$(COMPILER_PREFIX)$(WXCPU)_lib + $(DIRSEP)lib$(DIRSEP)$(COMPILER_PREFIX)$(WXCPU)_dll + + + + + wince + msw + + + $(WXLIBPATH)$(DIRSEP)$(WX_PORT)$(WXLIBPOSTFIX) + + + + + wxbase$(WX_VERSION)$(WXLIBPOSTFIX) + + + wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX) + + + + + + + + wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) + + + + + net + xml + + + + + + + wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) + + + + + core + media + xrc + html + adv + qa + aui + ribbon + propgrid + stc + richtext + + + + + @@ -142,21 +194,41 @@ FIXME: this template has (at least) the following bugs: - + - - - - wxbase$(WX_VERSION)$(WXLIBPOSTFIX) + $(WXLIB_BASE_NAME) + $(WXLIB_CORE_NAME) + + $(WXLIB_NET_NAME) + $(WXLIB_XML_NAME) + + $(WXLIB_MEDIA_NAME) + $(WXLIB_XRC_NAME) + $(WXLIB_HTML_NAME) + $(WXLIB_ADV_NAME) + $(WXLIB_QA_NAME) + $(WXLIB_AUI_NAME) + $(WXLIB_RIBBON_NAME) + $(WXLIB_PROPGRID_NAME) + $(WXLIB_RICHTEXT_NAME) + + + + wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) - - wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) + + + + $(WXLIB_STC_NAME) + wxscintilla$(WX3RDPARTYLIBPOSTFIX) - - wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) + + + Unknown wxWidgets library given in the wx-lib tag @@ -165,39 +237,46 @@ FIXME: this template has (at least) the following bugs: - + + -