X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/965122c49f786f6e905e06f19c11d05528ada843..cb751f46a0db6efd12b1e8f9d1074e71b6249253:/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 cd66946d7f..541e9fecf8 100644 --- a/build/bakefiles/wxpresets/presets/wx_win32.bkl +++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl @@ -10,21 +10,8 @@ - - - - @@ -41,110 +28,37 @@ FIXME: this template has (at least) the following bugs: + + + + + - - - - - % - - - - - - - $(DOLLAR)($(ENV_VAR)WXWIN) - - - - - - - - 0 - - - - - - - 0 - - - WX_DEBUG - 1 - 0 - - - 1 - - - - - 26 - - - - + + _UNICODE - - - - - - __WXDEBUG__ + + + + + + __WXDEBUG__ - + - - ud - d - u - - d + d @@ -156,9 +70,66 @@ FIXME: this template has (at least) the following bugs: $(DIRSEP)lib$(DIRSEP)$(COMPILER)$(WXCPU)_dll - $(WXLIBPATH)$(DIRSEP)msw$(WXLIBPOSTFIX) - - + + + 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 + stc + richtext + + + + + @@ -177,18 +148,36 @@ 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_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 @@ -199,40 +188,44 @@ FIXME: this template has (at least) the following bugs: position="before:__wx-libs-point"/> - + - - + + - wxtiff$(WX3RDPARTYLIBPOSTFIX) - wxjpeg$(WX3RDPARTYLIBPOSTFIX) - wxpng$(WX3RDPARTYLIBPOSTFIX) - wxzlib$(WX3RDPARTYLIBPOSTFIX) - - wxregex$(WXLIBPOSTFIX) + wxregex$(WXLIBPOSTFIX) wxexpat$(WX3RDPARTYLIBPOSTFIX) - + @@ -255,7 +248,6 @@ FIXME: this template has (at least) the following bugs: rpcrt4 advapi32 wsock32 - odbc32 @@ -263,10 +255,12 @@ 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 + + + +