X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6af800ff6db8ec372ec1e6ae409d56d89907c788..71696da09ee2e7a6c2cf12ac45537a084d168c47:/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 992eab2e93..35063a6ad2 100644 --- a/build/bakefiles/wxpresets/presets/wx_win32.bkl +++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl @@ -10,21 +10,8 @@ - - - - @@ -41,77 +28,13 @@ FIXME: this template has (at least) the following bugs: + + + + + - - - - - % - - - - - - - $(DOLLAR)($(ENV_VAR)WXWIN) - - - - - - - - 0 - - - - - - 0 - - - - - 1 - - - - - 26 - - @@ -134,11 +57,6 @@ FIXME: this template has (at least) the following bugs: - - ud - d - u - d @@ -152,11 +70,89 @@ FIXME: this template has (at least) the following bugs: $(DIRSEP)lib$(DIRSEP)$(COMPILER)$(WXCPU)_dll - + + wince msw - $(WXLIBPATH)$(DIRSEP)$(WXPORT)$(WXLIBPOSTFIX) + + $(WXLIBPATH)$(DIRSEP)$(WX_PORT)$(WXLIBPOSTFIX) + + + + + wxbase$(WX_VERSION) + wxbase$(WX_VERSION)d + wxbase$(WX_VERSION)u + wxbase$(WX_VERSION)ud + + + wx$(WX_PORT)$(WX_VERSION) + wx$(WX_PORT)$(WX_VERSION)d + wx$(WX_PORT)$(WX_VERSION)u + wx$(WX_PORT)$(WX_VERSION)ud + + + + + + + + wxbase$(WX_VERSION)_$(value) + + + wxbase$(WX_VERSION)d_$(value) + + + wxbase$(WX_VERSION)u_$(value) + + + wxbase$(WX_VERSION)ud_$(value) + + + + + net + xml + + + + + + + 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) + + + + + core + media + xrc + html + adv + qa + gl + aui + stc + richtext + + + @@ -177,18 +173,32 @@ FIXME: this template has (at least) the following bugs: - - - - wxbase$(WX_VERSION)$(WXLIBPOSTFIX) - - - wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) + $(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_GL_NAME) + $(WXLIB_QA_NAME) + $(WXLIB_AUI_NAME) + $(WXLIB_RICHTEXT_NAME) + + + + $(WXLIB_STC_NAME) + wxscintilla$(WX3RDPARTYLIBPOSTFIX) - - wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) + + + Unknown wxWidgets library given in the wx-lib tag @@ -209,6 +219,8 @@ FIXME: this template has (at least) the following bugs: -mthreads + $(substituteFromDict(WX_SHARED,{'1':'WXUSINGDLL','0':''})) + $(WXUNICODE_DEFINE) $(WXDEBUG_DEFINE) __WXMSW__ @@ -223,14 +235,14 @@ FIXME: this template has (at least) the following bugs: after __wx-libs-point: --> - wxtiff$(WX3RDPARTYLIBPOSTFIX) + wxtiff$(WX3RDPARTYLIBPOSTFIX) wxjpeg$(WX3RDPARTYLIBPOSTFIX) wxpng$(WX3RDPARTYLIBPOSTFIX) wxzlib$(WX3RDPARTYLIBPOSTFIX) - wxregex$(WXLIBPOSTFIX) + wxregex$(WXLIBPOSTFIX) wxexpat$(WX3RDPARTYLIBPOSTFIX) @@ -255,7 +267,6 @@ FIXME: this template has (at least) the following bugs: rpcrt4 advapi32 wsock32 - odbc32 @@ -274,4 +285,32 @@ FIXME: this template has (at least) the following bugs: <__wx-syslibs/> + + + + + 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 + + + +