X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0019dee69e150bea613a25bf78cd057715efd272..6a603a10e77f719458939d117e46f7d8ed0b372b:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 6efad50fb0..89080fa27e 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -3,7 +3,7 @@ - + @@ -25,6 +25,7 @@ 0 + @@ -141,13 +142,14 @@ $(mk.evalExpr(wxwin.mkLibName('xrc'))) - - - $(mk.evalExpr(wxwin.mkLibName('odbc'))) - + + $(mk.evalExpr(wxwin.mkLibName('aui'))) - - $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) + + $(mk.evalExpr(wxwin.mkLibName('richtext'))) + + + $(mk.evalExpr(wxwin.mkLibName('stc'))) @@ -174,13 +176,13 @@ $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(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,9 +196,9 @@ - $(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) @@ -262,6 +264,7 @@ _UNICODE + wxUSE_UNICODE=0 wxUSE_UNICODE_MSLU=1 @@ -276,6 +279,15 @@ unicows + + + gdiplus + + + wxUSE_GRAPHICS_CONTEXT=1 + + + /MACHINE:AMD64 /MACHINE:AMD64 @@ -296,16 +308,10 @@ $(NO_VC_CRTDBG) $(WIN32_WINNT) - - - $(_ldlibs.replace('ccrtrtti.lib', '')) - $(_cppflags.replace('/GR', '')) - $(LINK_TARGET_CPU) + $(TOP_SRCDIR)build/wince/missing @@ -642,13 +666,13 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r wxtiff wxjpeg wxpng + wxscintilla @@ -656,6 +680,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(DOLLAR)(%SCITECH)/include + $(INC_TIFF_BUILD) $(INC_TIFF) $(INC_JPEG) $(INC_PNG) @@ -664,7 +689,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r @@ -740,14 +764,15 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r - + $(wxwin.libToLink(value)) $(wxwin.extraLdflags(value)) - + + $(wxwin.makeDspDependency(value))