X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2713e62971681f82a95fa7b701c796c5fe864a74..cb751f46a0db6efd12b1e8f9d1074e71b6249253:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 1d95059e87..89080fa27e 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -3,7 +3,7 @@ - + @@ -25,6 +25,7 @@ 0 + @@ -141,20 +142,15 @@ $(mk.evalExpr(wxwin.mkLibName('xrc'))) - - - $(mk.evalExpr(wxwin.mkLibName('odbc'))) - - - - $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) - $(mk.evalExpr(wxwin.mkLibName('aui'))) $(mk.evalExpr(wxwin.mkLibName('richtext'))) + + $(mk.evalExpr(wxwin.mkLibName('stc'))) + $(mk.evalExpr(wxwin.mkLibName('mono'))) @@ -180,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) @@ -200,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) @@ -268,6 +264,7 @@ _UNICODE + wxUSE_UNICODE=0 wxUSE_UNICODE_MSLU=1 @@ -285,10 +282,10 @@ gdiplus - - + + wxUSE_GRAPHICS_CONTEXT=1 - + @@ -311,13 +308,6 @@ $(NO_VC_CRTDBG) $(WIN32_WINNT) - - - $(_ldlibs.replace('ccrtrtti.lib', '')) - $(_cppflags.replace('/GR', '')) - $(LINK_TARGET_CPU) @@ -347,33 +337,37 @@ - $(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 +InputPath=..\..\include\wx\%s "$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" $(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 + + + @@ -427,10 +421,24 @@ $(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" + + + + 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" + + @@ -449,8 +457,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r - + @@ -495,7 +503,9 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(MGLLIBPATH) $(MGLLIBPATH)/$(MGLPMLIBPATH) + max + $(CXXWARNINGS) -wcd=549 -wcd=656 @@ -511,7 +521,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r @@ -597,6 +603,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(wxwin.mkLibName(wxid)) $(WXLIBNAME) + WXBUILDING + $(WXTOPDIR)src/common/dummy.cpp @@ -646,12 +654,10 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(WXMACVERSION_CMD) - - WXDLLNAME=$(WXDLLNAME) - - $(RCDEFDIR) - $(TOP_SRCDIR)include - + WXDLLNAME=$(WXDLLNAME) + + $(RCDEFDIR) + $(TOP_SRCDIR)include $(WXTOPDIR)src/msw/version.rc @@ -660,13 +666,13 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r wxtiff wxjpeg wxpng + wxscintilla @@ -674,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) @@ -682,7 +689,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r @@ -758,14 +764,15 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r - + $(wxwin.libToLink(value)) $(wxwin.extraLdflags(value)) - + + $(wxwin.makeDspDependency(value))