X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c81032a760e9851cc8b8338c763214f4adb20b23..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 fc685abb35..35063a6ad2 100644 --- a/build/bakefiles/wxpresets/presets/wx_win32.bkl +++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl @@ -10,21 +10,8 @@ - - - - @@ -41,98 +28,13 @@ FIXME: this template has (at least) the following bugs: - - - - - - % - - - - - - - 0 - 1 - 0 - + + + + + - - - $(DOLLAR)($(ENV_VAR)WXWIN) - - - - - - - - 0 - - - - - - - 0 - - - - - 1 - - - - - 27 - - - - - 0 - - - @@ -155,11 +57,6 @@ FIXME: this template has (at least) the following bugs: - - ud - d - u - d @@ -173,11 +70,14 @@ 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) @@ -193,82 +93,63 @@ FIXME: this template has (at least) the following bugs: WX_MONOLITHIC=1, then the base library is translated to the monolithic library --> - wx$(WXPORT)$(WX_VERSION) - wx$(WXPORT)$(WX_VERSION)d - wx$(WXPORT)$(WX_VERSION)u - wx$(WXPORT)$(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)_net - wxbase$(WX_VERSION)d_net - wxbase$(WX_VERSION)u_net - wxbase$(WX_VERSION)ud_net - - - wxbase$(WX_VERSION)_xml - wxbase$(WX_VERSION)d_xml - wxbase$(WX_VERSION)u_xml - wxbase$(WX_VERSION)ud_xml - - - wxbase$(WX_VERSION)_odbc - wxbase$(WX_VERSION)d_odbc - wxbase$(WX_VERSION)u_odbc - wxbase$(WX_VERSION)ud_odbc + + + + wxbase$(WX_VERSION)_$(value) + + + wxbase$(WX_VERSION)d_$(value) + + + wxbase$(WX_VERSION)u_$(value) + + + wxbase$(WX_VERSION)ud_$(value) + + + + net + xml - - - wx$(WXPORT)$(WX_VERSION)_core - wx$(WXPORT)$(WX_VERSION)d_core - wx$(WXPORT)$(WX_VERSION)u_core - wx$(WXPORT)$(WX_VERSION)ud_core - - - wx$(WXPORT)$(WX_VERSION)_media - wx$(WXPORT)$(WX_VERSION)d_media - wx$(WXPORT)$(WX_VERSION)u_media - wx$(WXPORT)$(WX_VERSION)ud_media - - - wx$(WXPORT)$(WX_VERSION)_xrc - wx$(WXPORT)$(WX_VERSION)d_xrc - wx$(WXPORT)$(WX_VERSION)u_xrc - wx$(WXPORT)$(WX_VERSION)ud_xrc - - - wx$(WXPORT)$(WX_VERSION)_html - wx$(WXPORT)$(WX_VERSION)d_html - wx$(WXPORT)$(WX_VERSION)u_html - wx$(WXPORT)$(WX_VERSION)ud_html - - - wx$(WXPORT)$(WX_VERSION)_adv - wx$(WXPORT)$(WX_VERSION)d_adv - wx$(WXPORT)$(WX_VERSION)u_adv - wx$(WXPORT)$(WX_VERSION)ud_adv - - - wx$(WXPORT)$(WX_VERSION)_qa - wx$(WXPORT)$(WX_VERSION)d_qa - wx$(WXPORT)$(WX_VERSION)u_qa - wx$(WXPORT)$(WX_VERSION)ud_qa - - - wx$(WXPORT)$(WX_VERSION)_dbgrid - wx$(WXPORT)$(WX_VERSION)d_dbgrid - wx$(WXPORT)$(WX_VERSION)u_dbgrid - wx$(WXPORT)$(WX_VERSION)ud_dbgrid - - - wx$(WXPORT)$(WX_VERSION)_gl - wx$(WXPORT)$(WX_VERSION)d_gl - wx$(WXPORT)$(WX_VERSION)u_gl - wx$(WXPORT)$(WX_VERSION)ud_gl - + + + + + 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 @@ -299,23 +180,24 @@ FIXME: this template has (at least) the following bugs: $(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) - - - - wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) + $(WXLIB_AUI_NAME) + $(WXLIB_RICHTEXT_NAME) + + + + $(WXLIB_STC_NAME) + wxscintilla$(WX3RDPARTYLIBPOSTFIX) - + Unknown wxWidgets library given in the wx-lib tag @@ -337,6 +219,8 @@ FIXME: this template has (at least) the following bugs: -mthreads + $(substituteFromDict(WX_SHARED,{'1':'WXUSINGDLL','0':''})) + $(WXUNICODE_DEFINE) $(WXDEBUG_DEFINE) __WXMSW__ @@ -365,7 +249,6 @@ FIXME: this template has (at least) the following bugs: ole2w32 - odbc32 @@ -384,7 +267,6 @@ FIXME: this template has (at least) the following bugs: rpcrt4 advapi32 wsock32 - odbc32 @@ -403,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 + + + +