X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dce0742b30a3d71604f6cefbc4e2717c7770f475..bd018e7e31361bc2112a386f18663908a0559d58:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 1edb1ad4f3..bebeca6399 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -2,38 +2,71 @@ - + + + + + + + + + 0 + + + + 0 + - - + + + - + $(wxwin.getVersionMajor()) $(wxwin.getVersionMinor()) $(wxwin.getVersionRelease()) - $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE) + + $(WXVER_MAJOR).$(WXVER_MINOR) + + + $(WXVER_MAJOR)$(WXVER_MINOR) + + + $(WX_RELEASE).$(WXVER_RELEASE) + + + $(WX_RELEASE_NODOT)$(WXVER_RELEASE) + $(int(int(WXVER_MINOR) % 2 == 0)) + + 0 + - 0.0.0 + $(WX_BINARY_VERSION).0.0 $(WXVER_RELEASE).0.0 $(WX_VERSION) - $(WXVER_MAJOR)$(WXVER_MINOR) - $(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE) + $(WX_RELEASE_NODOT) + $(WX_VERSION_NODOT) - - + + @@ -42,7 +75,7 @@ base $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) - + _carbon @@ -65,12 +98,13 @@ d - u + + u - $(WXUNICODEFLAG)$(WXDEBUGFLAG) + $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) - + univ @@ -81,14 +115,14 @@ wx_base$(WXBASEPORT) wx_$(PORTNAME)$(WXUNIVNAME) - -$(WXVER_MAJOR).$(WXVER_MINOR) + -$(WX_RELEASE) - wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR) + wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT) - wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR) + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT) @@ -108,7 +142,7 @@ $(WXVERSIONTAG) - + @@ -119,20 +153,31 @@ $(mk.evalExpr(wxwin.mkLibName('net'))) + + $(mk.evalExpr(wxwin.mkLibName('qa'))) + $(mk.evalExpr(wxwin.mkLibName('core'))) $(mk.evalExpr(wxwin.mkLibName('adv'))) + + $(mk.evalExpr(wxwin.mkLibName('media'))) + $(mk.evalExpr(wxwin.mkLibName('html'))) $(mk.evalExpr(wxwin.mkLibName('xml'))) + + $(mk.evalExpr(wxwin.mkLibName('xrc'))) + - $(mk.evalExpr(wxwin.mkLibName('odbc'))) + + $(mk.evalExpr(wxwin.mkLibName('odbc'))) + $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) @@ -141,12 +186,15 @@ $(mk.evalExpr(wxwin.mkLibName('mono'))) - - + + - + + + _$(CPU) + @@ -155,18 +203,38 @@ $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) - $(COMPILER)_$(CFG_NAME_PART) + + + $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) + + + build_cbx_$(CFG_NAME_PART) + + $(OBJS) - + + + lib + dll + + $(top_builddir)lib - $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART) + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) - + + + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) + + + + + @@ -178,7 +246,8 @@ off - $(DEBUGINFO) + on + off off on @@ -186,15 +255,47 @@ off speed + + on + off + + + on + off + + + multi + single + + + + wxNO_RTTI + + + wxNO_EXCEPTIONS + + + wxNO_THREADS + __WXDEBUG__ __WXDEBUG__ + + + __NO_VC_CRTDBG__ + __NO_VC_CRTDBG__ + - wxUSE_UNICODE=1 + _UNICODE - + + + + _WIN32_WINNT=0x0400 + + unicows @@ -203,32 +304,91 @@ $(DEBUGINFO) $(DEBUGRUNTIME) $(OPTIMIZEFLAG) - multi + $(THREADSFLAG) $(RUNTIME_LIBS) + $(RTTIFLAG) + $(EXCEPTIONSFLAG) $(EXTRACFLAGS) + $(NO_VC_CRTDBG) + $(WIN32_WINNT) - + + + + $(FORMAT in ['msvc6prj','msevc4prj']) + + + + + + + $(addPrefixToList('include\', wxwin.headersOnly(value))) + + + + + $(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 + + + + + + - + @@ -238,27 +398,48 @@ - + - + + + + $(EXTRALIBS) $(EXTRALIBS_GUI) + $(EXTRALIBS) + + + + $(EXTRALIBS_GUI) + + @@ -271,17 +452,24 @@ $(LIB_ODBC) $(LIB_REGEX) $(LIB_EXPAT) - - $(EXTRALIBS) + + $(EXTRALIBS_FOR_BASE) $(UNICOWS_LIB) - - import32 + ole2w32 - + + ole32 + oleaut32 + uuid + commctrl + winsock + wininet + + kernel32 user32 gdi32 @@ -290,7 +478,6 @@ winmm shell32 comctl32 - odbc32 ole32 oleaut32 uuid @@ -298,37 +485,19 @@ advapi32 wsock32 - - - - - - - $(addPrefixToList('include\', wxwin.headersOnly(value))) - - - - - - - wx/msw/setup.h - - include\wx\msw\setup.h - - -Creating $(LIBDIRNAME)\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"$(LIBDIRNAME)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" -$(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h - + + oleacc + + + odbc32 + - + @@ -340,33 +509,31 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h $(WXLIB_MONO) - + 0 - + -