X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66b9f7f7e4c649bf21598e18be1f0bf2b433f494..75cb911c7c8a475269901bf5f0c69c583d79e498:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 0d07a829d5..0ab45bc3a4 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,15 +146,24 @@ $(mk.evalExpr(wxwin.mkLibName('xrc'))) - - - $(mk.evalExpr(wxwin.mkLibName('odbc'))) - + + $(mk.evalExpr(wxwin.mkLibName('aui'))) - - $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) + + $(mk.evalExpr(wxwin.mkLibName('ribbon'))) + + + $(mk.evalExpr(wxwin.mkLibName('propgrid'))) + + + $(mk.evalExpr(wxwin.mkLibName('richtext'))) + + + $(mk.evalExpr(wxwin.mkLibName('stc'))) + + + $(mk.evalExpr(wxwin.mkLibName('webview'))) - $(mk.evalExpr(wxwin.mkLibName('mono'))) @@ -172,15 +186,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 +208,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,9 +266,13 @@ - __WXDEBUG__ - __WXDEBUG__ + wxDEBUG_LEVEL=0 + + + NDEBUG + NDEBUG + __NO_VC_CRTDBG__ @@ -262,6 +280,7 @@ _UNICODE + wxUSE_UNICODE=0 wxUSE_UNICODE_MSLU=1 @@ -275,10 +294,19 @@ unicows + + cairo + + + $(DOLLAR)(CAIRO_ROOT)/lib + + + $(DOLLAR)(CAIRO_ROOT)/include/cairo + - /MACHINE:AMD64 - /MACHINE:AMD64 + /MACHINE:X64 + /MACHINE:X64 /MACHINE:IA64 /MACHINE:IA64 @@ -296,13 +324,6 @@ $(NO_VC_CRTDBG) $(WIN32_WINNT) - - - $(_ldlibs.replace('ccrtrtti.lib', '')) - $(_cppflags.replace('/GR', '')) - $(LINK_TARGET_CPU) @@ -316,7 +337,7 @@ - $(FORMAT in ['msvc6prj','msevc4prj']) - - - - - $(addPrefixToList('include\', wxwin.headersOnly(value))) - - - - - $(addPrefixToList('include\\', wxwin.headersOnly(value))) - - + + $(addPrefixToList('include\\', wxwin.headersOnly(value))) + - + +Creating $(SETUPHDIR)\wx\setup.h +InputPath=..\..\include\wx\%s + +"$(SETUPHDIR)\wx\setup.h" : +$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h + + Creating $(SETUPHDIR)\wx\setup.h -InputPath=..\include\wx\%s +InputPath=..\..\include\wx\%s "$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h @@ -412,8 +446,9 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h Creating $(SETUPHDIR)\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(DOLLAR)(SETUPHDIR)\wx\msw" +"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw" $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h" @@ -434,8 +469,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r - + @@ -467,6 +502,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r __WX$(TOOLKIT)__ $(WXUNIV_DEFINE) $(DEBUG_DEFINE) + $(NDEBUG_DEFINE) $(EXCEPTIONS_DEFINE) $(RTTI_DEFINE) $(THREAD_DEFINE) @@ -474,12 +510,15 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(MSLU_DEFINE) $(SETUPHDIR) $(TOP_SRCDIR)include + $(CAIRO_INCLUDEDIR) $(LIBDIRNAME) $(MGLLIBPATH) $(MGLLIBPATH)/$(MGLPMLIBPATH) + max + $(CXXWARNINGS) -wcd=549 -wcd=656 @@ -495,7 +534,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r @@ -563,10 +603,16 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(EXTRALIBS_FOR_GUI) + + $(LIB_PNG) + @@ -657,6 +705,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(DOLLAR)(%SCITECH)/include + $(INC_TIFF_BUILD) $(INC_TIFF) $(INC_JPEG) $(INC_PNG) @@ -665,7 +714,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r @@ -708,13 +756,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(PLUGVERDELIM)$(PLUGIN_VERSION0) - - - d - u - ud - - $(LIBDIR)/wx/$(PLUGIN_VERSION0) @@ -722,7 +763,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r