X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c802b3d9b5a29780f20510501eccd30ce50da20..bed0b9a68871026165fa2d3a4324b0199ed7718a:/build/bakefiles/common.bkl?ds=sidebyside
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index aac290e174..bd4ac24a21 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -19,7 +19,9 @@
$(wxwin.getVersionMajor())
$(wxwin.getVersionMinor())
$(wxwin.getVersionRelease())
- $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
+
+ $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
+
$(int(int(WXVER_MINOR) % 2 == 0))
@@ -161,10 +163,20 @@
$(top_builddir)lib
-
- $(nativePaths(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)
+
+
+
@@ -186,13 +198,26 @@
off
speed
+
+ on
+ off
+
__WXDEBUG__
__WXDEBUG__
+
+
+ __NO_VC_CRTDBG__
+ __NO_VC_CRTDBG__
+
- wxUSE_UNICODE=1
+ _UNICODE
+
+
+
+ unicows
@@ -201,9 +226,12 @@
$(OPTIMIZEFLAG)
multi
$(RUNTIME_LIBS)
+ $(EXCEPTIONSFLAG)
+ $(EXCEPTIONSFLAG)
$(EXTRACFLAGS)
+ $(NO_VC_CRTDBG)
@@ -213,6 +241,11 @@
$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)
+
+ SHARED=='0'
@@ -242,14 +275,8 @@
$(UNICODE_DEFINE)
$(TOP_SRCDIR)include
$(LIBDIRNAME)
- $(LIBDIRNAME)
- $(INC_TIFF)
- $(INC_JPEG)
- $(INC_PNG)
- $(INC_ZLIB)
- $(INC_ODBC)
- $(INC_REGEX)
- $(INC_EXPAT)
+ $(SETUPHDIR)
+ max
@@ -267,8 +294,8 @@
+ $(UNICOWS_LIB)
- import32
ole2w32
@@ -288,6 +315,9 @@
advapi32
wsock32
+
+ oleacc
+
@@ -306,11 +336,11 @@
include\wx\msw\setup.h
-Creating $(LIBDIRNAME)\wx\setup.h
+Creating $(SETUPHDIR)\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
+"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
+$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
@@ -363,11 +393,11 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
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
+ Common Headers:*wx/*.h
@@ -388,21 +418,92 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
wxodbc
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))
+