X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61a15bac86cd10322606e63e288a177df643e03e..cfcc02a8a4f019e3846b73660209080602e44967:/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 cb750a6391..b056dc2223 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,65 @@ 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)$(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 + propgrid + stc + richtext + + + @@ -177,18 +149,37 @@ 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_PROPGRID_NAME) + $(WXLIB_RICHTEXT_NAME) + + + + wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) - - wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) + + + + $(WXLIB_STC_NAME) + wxscintilla$(WX3RDPARTYLIBPOSTFIX) - - wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value) + + + Unknown wxWidgets library given in the wx-lib tag @@ -209,12 +200,16 @@ FIXME: this template has (at least) the following bugs: -mthreads + $(substituteFromDict(WX_SHARED,{'1':'WXUSINGDLL','0':''})) + $(WXUNICODE_DEFINE) $(WXDEBUG_DEFINE) __WXMSW__ - $(WX_DIR)$(WXLIBINCLUDE) - $(WX_DIR)/include + + $(WX_DIR)$(WXLIBINCLUDE) + $(WX_DIR)/include + @@ -223,14 +218,14 @@ FIXME: this template has (at least) the following bugs: after __wx-libs-point: --> - wxtiff$(WX3RDPARTYLIBPOSTFIX) - wxjpeg$(WX3RDPARTYLIBPOSTFIX) - wxpng$(WX3RDPARTYLIBPOSTFIX) - wxzlib$(WX3RDPARTYLIBPOSTFIX) - - wxregex$(WXLIBPOSTFIX) + wxregex$(WXLIBPOSTFIX) wxexpat$(WX3RDPARTYLIBPOSTFIX) @@ -255,7 +250,6 @@ FIXME: this template has (at least) the following bugs: rpcrt4 advapi32 wsock32 - odbc32 @@ -266,7 +260,9 @@ FIXME: this template has (at least) the following bugs: + + + + + 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 + + + +