X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3103e8a97e834e9793f0eb149aa82a99fd64ef9a..9142a5ec3f9e9232d47ef09fe4a3c96f39816dc4:/build/bakefiles/wxpresets/presets/wx_win32.bkl?ds=inline diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl index 6d4f19b509..d3b24b2186 100644 --- a/build/bakefiles/wxpresets/presets/wx_win32.bkl +++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl @@ -1,5 +1,4 @@ - @@ -7,139 +6,178 @@ into Bakefile's presets --> - - - - - - - - - - - - - - - + - - - - - - - - - % - + + + + 1 + 0 + + + + 1 + 0 + + + 1 + 1 + 0 - - $(DOLLAR)($(ENV_VAR)WXWIN) - - - - - 0 - - - - - 0 - - - 1 - - - 26 - + + + + X86 + + + + + + X86 + AMD64 + IA64 + + + + + - - + + _UNICODE - - - - - - __WXDEBUG__ + + + + + + __WXDEBUG__ - + - - ud - d - u - - + d - - $(DIRSEP)lib$(DIRSEP)$(COMPILER)_lib - $(DIRSEP)lib$(DIRSEP)$(COMPILER)_dll + + _$(CPU) + _x64 + _ia64 + + + + + /MACHINE:AMD64 + /MACHINE:IA64 - - $(WXLIBPATH)$(DIRSEP)msw$(WXLIBPOSTFIX) + + $(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 + webview + + + + + @@ -158,18 +196,39 @@ 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) + $(WXLIB_WEBVIEW_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 @@ -180,40 +239,44 @@ FIXME: this template has (at least) the following bugs: position="before:__wx-libs-point"/> - + - - + + - wxtiff$(WX3RDPARTLIBPOSTFIX) - wxjpeg$(WX3RDPARTLIBPOSTFIX) - wxpng$(WX3RDPARTLIBPOSTFIX) - wxzlib$(WX3RDPARTLIBPOSTFIX) - - wxregex$(WXLIBPOSTFIX) - wxexpat$(WX3RDPARTLIBPOSTFIX) - + wxregex$(WXLIBPOSTFIX) + wxexpat$(WX3RDPARTYLIBPOSTFIX) + @@ -221,7 +284,7 @@ FIXME: this template has (at least) the following bugs: - + kernel32 user32 gdi32 @@ -236,7 +299,6 @@ FIXME: this template has (at least) the following bugs: rpcrt4 advapi32 wsock32 - odbc32 @@ -244,15 +306,47 @@ FIXME: this template has (at least) the following bugs: oleacc - + + + + + + all + + + + @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \ + echo ---------------------------------------------------------------------------- + @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \ + echo The selected wxWidgets build is not available! + @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \ + echo Please use the options prefixed with WX_ to select another wxWidgets build. + @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \ + echo ---------------------------------------------------------------------------- + @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \ + exit 1 + + + +