X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b44ea2b40da07e86d08faeff3ca4d2532afc928..bf5ff0c308f38727c0c791ca11cd7697112f4566:/build/bakefiles/common.bkl?ds=inline
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index f428e65743..38be4fa522 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -19,10 +19,21 @@
$(wxwin.getVersionMajor())
$(wxwin.getVersionMinor())
$(wxwin.getVersionRelease())
- $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
+
+ $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
+
+
+ $(int(int(WXVER_MINOR) % 2 == 0))
- 0.0.0
+
+ 0.0.0
+ $(WXVER_RELEASE).0.0
+
$(WX_VERSION)
+
+ $(WXVER_MAJOR)$(WXVER_MINOR)
+ $(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)
+
@@ -52,7 +63,8 @@
- d
+ d
+ d
u
@@ -83,13 +95,13 @@
- wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR)
+ wxbase$(WXBASEPORT)$(WXWIN32DLLVERSION)
$(WXNAMEPREFIX)
- wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)
+ wx$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION)
$(WXNAMEPREFIXGUI)
@@ -106,12 +118,27 @@
$(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')))
@@ -130,56 +157,101 @@
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
- $(COMPILER)_$(CFG_NAME_PART)
+
+ $(COMPILER)_$(CFG_NAME_PART)
+
+ build_cbx_$(CFG_NAME_PART)
+
+
$(OBJS)
-
+
$(top_builddir)lib
-
- $(TOP_SRCDIR)lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART)
+
+ $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_lib$(CFG)
+
+
+ $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_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
- $(DEBUGFLAG)
+ $(DEBUGINFO)
+ $(DEBUGRUNTIME)
$(OPTIMIZEFLAG)
multi
$(RUNTIME_LIBS)
+ $(EXCEPTIONSFLAG)
+ $(EXCEPTIONSFLAG)
$(EXTRACFLAGS)
+ $(NO_VC_CRTDBG)
- setup.h
$(LIBDIRNAME)
$(LIBDIR)
- $(id)$(WXDEBUGFLAG)
+ $(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)
+
+ SHARED=='0'
@@ -194,6 +266,7 @@
+
@@ -206,19 +279,16 @@
$(WXUNIV_DEFINE)
$(DEBUG_DEFINE)
$(UNICODE_DEFINE)
- $(TOP_SRCDIR)include
+
+ $(TOP_SRCDIR)include
$(LIBDIRNAME)
- $(LIBDIRNAME)
- $(INC_TIFF)
- $(INC_JPEG)
- $(INC_PNG)
- $(INC_ZLIB)
- $(INC_ODBC)
- $(INC_REGEX)
+ $(SETUPHDIR)
+ max
-
+
$(LIB_TIFF)
$(LIB_JPEG)
@@ -226,16 +296,17 @@
$(LIB_ZLIB)
$(LIB_ODBC)
$(LIB_REGEX)
+ $(LIB_EXPAT)
$(EXTRALIBS)
-
- import32
+ $(UNICOWS_LIB)
+
ole2w32
-
+
kernel32
user32
gdi32
@@ -252,27 +323,90 @@
advapi32
wsock32
-
+
+ oleacc
+
+
+
+
+
+ $(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
+
+
+
+
+
-
+
$(EXTRALIBS_GUI)
+
+
+
+ $(WXLIB_MONO)
+
+
+
+ $(WXLIB_MONO)
+
+
+
+ 0
+
$(wxwin.mkLibName(wxid))
$(WXLIBNAME)
-
- $(WXTOPDIR)src/msw/dummy.cpp
-
- $(WXTOPDIR)src/msw/dummy.cpp
-
+
+
+ $(WXTOPDIR)src/msw/dummy.cpp
+
+ $(WXTOPDIR)src/msw/dummy.cpp
+
+
+ wx/wxprec.h
+ on
+ wxprec_$(id)
+
+ src/common/unzip.c
+ src/common/extended.c
+ src/msw/gsocket.c
+ src/msw/gsockmsw.c
+
+
+
+
+ Common Sources:src/common/*
+ MSW Sources:src/msw/*
+ Generic Sources:src/generic/*
+ wxUniv Sources:src/univ/*
+ wxHTML Sources:src/html/*
+ Setup Headers:*/setup.h
+ MSW Headers:*wx/msw/*.h
+ Generic Headers:*wx/generic/*.h
+ wxUniv Headers:*wx/univ/*.h
+ wxHTML Headers:*wx/html/*.h
+ Common Headers:*wx/*.h
- wx/wxprec.h
- on
- wxprec_$(id)
@@ -283,29 +417,101 @@
$(WXMACVERSION)
-
-
-
+
wxtiff
wxjpeg
wxpng
+ wxexpat
wxzlib
wxodbc
wxregex
-
- wxzlib
- wxregex
+
+
+ $(INC_TIFF)
+ $(INC_JPEG)
+ $(INC_PNG)
+ $(INC_ZLIB)
+ $(INC_ODBC)
+ $(INC_REGEX)
+ $(INC_EXPAT)
+
+
+
+
+
+
+ wxUSE_GUI=0
+
+
+
+
+ wxUSE_GUI=0
+
+
+
+
+
+
+
+
+
+ -$(WXVER_MAJOR).$(WXVER_MINOR)
+
+
+ $(WXVER_MAJOR)$(WXVER_MINOR)
+
+
+
+
+
+
+ -$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
+
+
+ $(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)
+
+
+
+
+
+
+
+ $(id)$(addPrefixIfNotEmpty('_',WXNAMESUFFIX))$(PLUGIN_VERSION)$(WXCOMPILER)
+
+ WXUSINGDLL
+ wxUSE_GUI=0
+
+
+
+
+
+
+ $(id)_$(PORTNAME)$(WXUNIVNAME)$(WXNAMESUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
+
+ WXUSINGDLL
+
+
+
-
+
$(wxwin.libToLink(value))
+ $(wxwin.extraLdflags(value))
+
+ $(wxwin.makeDspDependency(value))
+