X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3b108b80c02d5c69c9f5a4cf5a764223065d020..a2b772607a87ffe6fe9af8c0b64b7259ef10a4a4:/build/bakefiles/common.bkl?ds=inline diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 46651347d5..3da1ea4621 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -2,6 +2,8 @@ + + @@ -10,19 +12,31 @@ - + + - + $(wxwin.getVersionMajor()) $(wxwin.getVersionMinor()) $(wxwin.getVersionRelease()) - $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE) + + $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE) + - 0.0.0 + $(int(int(WXVER_MINOR) % 2 == 0)) + + + 0.0.0 + $(WXVER_RELEASE).0.0 + $(WX_VERSION) + + $(WXVER_MAJOR)$(WXVER_MINOR) + $(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE) + @@ -52,10 +66,12 @@ - d + d + d - u + + u $(WXUNICODEFLAG)$(WXDEBUGFLAG) @@ -83,13 +99,13 @@ - wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR) + wxbase$(WXBASEPORT)$(WXWIN32DLLVERSION) $(WXNAMEPREFIX) - wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR) + wx$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION) $(WXNAMEPREFIXGUI) @@ -106,15 +122,29 @@ $(mk.evalExpr(wxwin.mkLibName('base'))) + + $(mk.evalExpr(wxwin.mkLibName('net'))) + $(mk.evalExpr(wxwin.mkLibName('core'))) + + $(mk.evalExpr(wxwin.mkLibName('adv'))) + $(mk.evalExpr(wxwin.mkLibName('html'))) $(mk.evalExpr(wxwin.mkLibName('xml'))) + + + $(mk.evalExpr(wxwin.mkLibName('odbc'))) + + + + $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) + $(mk.evalExpr(wxwin.mkLibName('mono'))) @@ -125,6 +155,9 @@ + + _$(CPU) + @@ -133,58 +166,147 @@ $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) - $(COMPILER)_$(CFG_NAME_PART) + + + $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) + + + build_cbx_$(CFG_NAME_PART) + + $(OBJS) - + $(top_builddir)lib - - $(TOP_SRCDIR)lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART) + + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_lib$(CFG) + + + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_dll$(CFG) + + + + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) + + + - - on - off + + on + on + off + off + + + $(DEBUGINFO) + off + on off speed + + on + off + - __WXDEBUG__ + __WXDEBUG__ + __WXDEBUG__ + + + + __NO_VC_CRTDBG__ + __NO_VC_CRTDBG__ - wxUSE_UNICODE=1 + _UNICODE + + + + unicows + + + + $(FORMAT in ['msvc6prj','msevc4prj']) + + + + + $(addPrefixToList('include\', wxwin.headersOnly(value))) + + + + + + + wx/msw/wince/setup.h + wince\setup.h + wince_setup_h + + + wx/msw/setup.h + setup.h + setup_h + + + + include\wx\msw\$(vc_setup_h) + + +Creating $(SETUPHDIR)\wx\setup.h +InputPath=..\include\wx\msw\$(vc_setup_h) + +"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" +$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h + + + + + @@ -201,7 +323,7 @@ - + @@ -237,11 +355,19 @@ - - import32 + $(UNICOWS_LIB) + ole2w32 - + + ole32 + oleaut32 + uuid + commctrl + winsock + wininet + + kernel32 user32 gdi32 @@ -250,7 +376,6 @@ winmm shell32 comctl32 - odbc32 ole32 oleaut32 uuid @@ -258,9 +383,16 @@ advapi32 wsock32 - + + oleacc + + + odbc32 + + + + 0 + -