X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c26fe83eb8b3f2dd33e21c1ed1d8094064de1ad..524d97b1c22daf69c57ca92c55ef4bbb206a0943:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 942756c03e..f2abec66fd 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -3,7 +3,7 @@ - + @@ -25,6 +25,7 @@ 0 + @@ -141,20 +142,18 @@ $(mk.evalExpr(wxwin.mkLibName('xrc'))) - - - $(mk.evalExpr(wxwin.mkLibName('odbc'))) - - - - $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) - $(mk.evalExpr(wxwin.mkLibName('aui'))) + + $(mk.evalExpr(wxwin.mkLibName('propgrid'))) + $(mk.evalExpr(wxwin.mkLibName('richtext'))) + + $(mk.evalExpr(wxwin.mkLibName('stc'))) + $(mk.evalExpr(wxwin.mkLibName('mono'))) @@ -180,13 +179,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) @@ -202,7 +201,7 @@ $(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) @@ -268,6 +267,7 @@ _UNICODE + wxUSE_UNICODE=0 wxUSE_UNICODE_MSLU=1 @@ -285,10 +285,10 @@ gdiplus - - + + wxUSE_GRAPHICS_CONTEXT=1 - + @@ -311,13 +311,6 @@ $(NO_VC_CRTDBG) $(WIN32_WINNT) - - - $(_ldlibs.replace('ccrtrtti.lib', '')) - $(_cppflags.replace('/GR', '')) - $(LINK_TARGET_CPU) @@ -347,10 +340,6 @@ - - $(FORMAT in ['msvc6prj','msevc4prj','msvs2005prj']) - - @@ -368,6 +357,20 @@ InputPath=..\..\include\wx\%s $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h + + + + FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE + + +Creating $(SETUPHDIR)\wx\setup.h +InputPath=..\..\include\wx\%s + +"$(SETUPHDIR)\wx\setup.h" : "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" +$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h + + + @@ -426,6 +429,19 @@ InputPath=..\..\include\wx\msw\genrcdefs.h "$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw" $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h" + + + + FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE + + +Creating $(SETUPHDIR)\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h + +"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(SETUPHDIR)\wx\msw" +$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h" + + @@ -444,8 +460,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r - + @@ -490,7 +506,9 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(MGLLIBPATH) $(MGLLIBPATH)/$(MGLPMLIBPATH) + max + $(CXXWARNINGS) -wcd=549 -wcd=656 @@ -506,7 +524,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r @@ -592,6 +606,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(wxwin.mkLibName(wxid)) $(WXLIBNAME) + WXBUILDING + $(WXTOPDIR)src/common/dummy.cpp @@ -653,13 +669,13 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r wxtiff wxjpeg wxpng + wxscintilla @@ -667,6 +683,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(DOLLAR)(%SCITECH)/include + $(INC_TIFF_BUILD) $(INC_TIFF) $(INC_JPEG) $(INC_PNG) @@ -675,7 +692,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r @@ -751,14 +767,15 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r - + $(wxwin.libToLink(value)) $(wxwin.extraLdflags(value)) - + + $(wxwin.makeDspDependency(value))