X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed4ccecd55c2f99c0c01974dd79b2c9fd712738f..3dd4386160b8f6d28ecc4ad2ca308c437721a41f:/build/bakefiles/common.bkl?ds=sidebyside diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 46e8a418e6..a4bf274f6d 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -2,6 +2,8 @@ + + @@ -10,17 +12,27 @@ - + + - + $(wxwin.getVersionMajor()) $(wxwin.getVersionMinor()) $(wxwin.getVersionRelease()) + + $(WXVER_MAJOR).$(WXVER_MINOR) + + + $(WXVER_MAJOR)$(WXVER_MINOR) + - $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE) + $(WX_RELEASE).$(WXVER_RELEASE) + + + $(WX_RELEASE_NODOT)$(WXVER_RELEASE) $(int(int(WXVER_MINOR) % 2 == 0)) @@ -31,8 +43,8 @@ $(WX_VERSION) - $(WXVER_MAJOR)$(WXVER_MINOR) - $(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE) + $(WX_RELEASE_NODOT) + $(WX_VERSION_NODOT) @@ -67,10 +79,11 @@ d - u + + u - $(WXUNICODEFLAG)$(WXDEBUGFLAG) + $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) @@ -83,14 +96,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) @@ -133,8 +146,13 @@ $(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'))) @@ -149,6 +167,9 @@ + + _$(CPU) + @@ -157,17 +178,25 @@ $(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 - $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_lib$(CFG) + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_lib$(CFG) - $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_dll$(CFG) + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_dll$(CFG) @@ -198,11 +227,20 @@ off speed + + on + off + __WXDEBUG__ __WXDEBUG__ + + + __NO_VC_CRTDBG__ + __NO_VC_CRTDBG__ + _UNICODE @@ -217,9 +255,12 @@ $(OPTIMIZEFLAG) multi $(RUNTIME_LIBS) + $(EXCEPTIONSFLAG) + $(EXCEPTIONSFLAG) $(EXTRACFLAGS) + $(NO_VC_CRTDBG) + + + + $(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 + + + + + @@ -252,18 +340,35 @@ - + + + + $(EXTRALIBS) $(EXTRALIBS_GUI) + $(EXTRALIBS) + + + + $(EXTRALIBS_GUI) + + @@ -277,16 +382,23 @@ $(LIB_REGEX) $(LIB_EXPAT) - $(EXTRALIBS) + $(EXTRALIBS_FOR_BASE) $(UNICOWS_LIB) - - import32 + ole2w32 - + + ole32 + oleaut32 + uuid + commctrl + winsock + wininet + + kernel32 user32 gdi32 @@ -295,7 +407,6 @@ winmm shell32 comctl32 - odbc32 ole32 oleaut32 uuid @@ -303,37 +414,19 @@ advapi32 wsock32 - - - - - - - $(addPrefixToList('include\', wxwin.headersOnly(value))) - - - - - - - wx/msw/setup.h - - include\wx\msw\setup.h - - -Creating $(SETUPHDIR)\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" -$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h - + + oleacc + + + odbc32 + - + @@ -354,7 +447,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h $(WXLIBNAME) - + $(WXTOPDIR)src/msw/dummy.cpp $(WXTOPDIR)src/msw/dummy.cpp @@ -366,12 +459,12 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h src/common/unzip.c src/common/extended.c - src/msw/gsocket.c - src/msw/gsockmsw.c + src/msw/gsocket.cpp + src/msw/gsockmsw.cpp - + Common Sources:src/common/* MSW Sources:src/msw/* Generic Sources:src/generic/* @@ -413,10 +506,6 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h $(INC_REGEX) $(INC_EXPAT) - - - + - - - -$(WXVER_MAJOR).$(WXVER_MINOR) - - - $(WXVER_MAJOR)$(WXVER_MINOR) - + + $(WX_RELEASE) + $(WX_RELEASE_NODOT) - - - -$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE) - - - $(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE) - + + $(WX_VERSION) + $(WX_VERSION_NODOT) + + - + + + $(PLUGVERDELIM)$(PLUGIN_VERSION0) + + + + d + u + ud + + + + $(LIBDIR)/wx/$(PLUGIN_VERSION0) + - + $(wxwin.libToLink(value)) - + $(wxwin.extraLdflags(value)) + $(wxwin.makeDspDependency(value)) + + + top_srcdir + +