X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc8953a695edc33b100378a3334738a94d1aa9f6..1a2df6a75b3d96b35e29b1cf392758cbeeef93e0:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 410524ddb6..d4f343018d 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -3,7 +3,7 @@ - + @@ -61,16 +61,20 @@ _$(VENDOR) + - d - d + d + d u + + $(WXUNICODEFLAG)$(WXDEBUGFLAG) + - $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) + $(WX_U_D_SUFFIX)$(WX_LIB_FLAVOUR) @@ -145,6 +149,9 @@ $(mk.evalExpr(wxwin.mkLibName('aui'))) + + $(mk.evalExpr(wxwin.mkLibName('propgrid'))) + $(mk.evalExpr(wxwin.mkLibName('richtext'))) @@ -174,7 +181,7 @@ dll - $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + $(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(WXDLLFLAG)$(CFG) @@ -308,13 +314,6 @@ $(NO_VC_CRTDBG) $(WIN32_WINNT) - - - $(_ldlibs.replace('ccrtrtti.lib', '')) - $(_cppflags.replace('/GR', '')) - $(LINK_TARGET_CPU) @@ -328,7 +327,7 @@