X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e3746dc75dafab097cd76cf8ff5f5b09f4c5c9f..5df6736f701dd4c896c70f5fd51b7ac9563787c5:/build/bakefiles/common.bkl?ds=inline
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 6ed713a200..896ee5e046 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -21,8 +21,17 @@
$(wxwin.getVersionRelease())
$(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)
+
@@ -33,6 +42,10 @@
base
$(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+
+
+ _carbon
+
$(COMPILER)
@@ -65,22 +78,27 @@
- wx_base
+ wx_base$(WXBASEPORT)
wx_$(PORTNAME)$(WXUNIVNAME)
-$(WXVER_MAJOR).$(WXVER_MINOR)
- wxbase$(WXVER_MAJOR)$(WXVER_MINOR)
- wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)
+
+ wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR)
+
+
+ wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)
- wxbase$(WXVER_MAJOR)$(WXVER_MINOR)
+
+ wxbase$(WXBASEPORT)$(WXWIN32DLLVERSION)
+
$(WXNAMEPREFIX)
- wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)
+ wx$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION)
$(WXNAMEPREFIXGUI)
@@ -89,10 +107,6 @@
$(WXVERSIONTAG)
-
- $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR)
-
-
@@ -101,12 +115,18 @@
$(mk.evalExpr(wxwin.mkLibName('base')))
+
+ $(mk.evalExpr(wxwin.mkLibName('net')))
+
$(mk.evalExpr(wxwin.mkLibName('core')))
$(mk.evalExpr(wxwin.mkLibName('html')))
+
+ $(mk.evalExpr(wxwin.mkLibName('xml')))
+
$(mk.evalExpr(wxwin.mkLibName('mono')))
@@ -129,10 +149,10 @@
$(OBJS)
-
+
$(top_builddir)lib
- $(TOP_SRCDIR)lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART)
+ $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART)
@@ -157,27 +177,23 @@
wxUSE_UNICODE=1
-
+
$(DEBUGFLAG)
$(OPTIMIZEFLAG)
multi
- dynamic
+ $(RUNTIME_LIBS)
$(EXTRACFLAGS)
- setup.h
$(LIBDIRNAME)
$(LIBDIR)
-
- $(EXTRACFLAGS)
-
-
- $(id)$(WXDEBUGFLAG)
+
+ $(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)
@@ -192,13 +208,14 @@
+
-
+
$(wxwin.mk_wxid(id))
__WX$(TOOLKIT)__
$(WXUNIV_DEFINE)
@@ -213,9 +230,11 @@
$(INC_ZLIB)
$(INC_ODBC)
$(INC_REGEX)
+ $(INC_EXPAT)
-
+
+
$(LIB_TIFF)
$(LIB_JPEG)
@@ -223,6 +242,7 @@
$(LIB_ZLIB)
$(LIB_ODBC)
$(LIB_REGEX)
+ $(LIB_EXPAT)
$(EXTRALIBS)
@@ -252,19 +272,84 @@
+
+
+
+ $(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
+
+
+
+
+
+
+
+ $(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
+ Common Headers:*wx/[!/]*.h
+ MSW Headers:*wx/msw/*.h
+ Generic Headers:*wx/generic/*.h
+ wxUniv Headers:*wx/univ/*.h
+ wxHTML Headers:*wx/html/*.h
- wx/wxprec.h
- on
- wxprec_$(id)
@@ -276,10 +361,23 @@
-
+
+
+ wxtiff
+ wxjpeg
+ wxpng
+ wxexpat
+ wxzlib
+ wxodbc
+ wxregex
+
+
wxtiff
wxjpeg
wxpng
+ wxexpat
wxzlib
wxodbc
wxregex