X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03575f9bd31b449fbe2000f3f31cf2e97e39d6a8..1a2df6a75b3d96b35e29b1cf392758cbeeef93e0:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 47e3606816..d4f343018d 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -3,7 +3,7 @@ - + @@ -25,6 +25,7 @@ 0 + @@ -60,16 +61,20 @@ _$(VENDOR) + - d - d + d + d u + + $(WXUNICODEFLAG)$(WXDEBUGFLAG) + - $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) + $(WX_U_D_SUFFIX)$(WX_LIB_FLAVOUR) @@ -141,13 +146,17 @@ $(mk.evalExpr(wxwin.mkLibName('xrc'))) - - - $(mk.evalExpr(wxwin.mkLibName('odbc'))) - + + $(mk.evalExpr(wxwin.mkLibName('aui'))) + + + $(mk.evalExpr(wxwin.mkLibName('propgrid'))) - - $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) + + $(mk.evalExpr(wxwin.mkLibName('richtext'))) + + + $(mk.evalExpr(wxwin.mkLibName('stc'))) @@ -172,15 +181,15 @@ dll - $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + $(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(WXDLLFLAG)$(CFG) + + + $(COMPILER) + - - $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) - - - build_cbx_$(CFG_NAME_PART) + $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) $(OBJS) @@ -194,15 +203,15 @@ - $(top_builddir)lib + $(wx_top_builddir)/lib - $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX) @@ -252,8 +261,7 @@ - __WXDEBUG__ - __WXDEBUG__ + wxDEBUG_LEVEL=0 @@ -262,6 +270,7 @@ _UNICODE + wxUSE_UNICODE=0 wxUSE_UNICODE_MSLU=1 @@ -276,6 +285,15 @@ unicows + + + gdiplus + + + wxUSE_GRAPHICS_CONTEXT=1 + + + /MACHINE:AMD64 /MACHINE:AMD64 @@ -296,16 +314,10 @@ $(NO_VC_CRTDBG) $(WIN32_WINNT) - - - $(_ldlibs.replace('ccrtrtti.lib', '')) - $(_cppflags.replace('/GR', '')) - $(LINK_TARGET_CPU) + $(TOP_SRCDIR)build/wince/missing