X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00375592f92f68c4ca3f44d8e839bcfd47adc4e1..751e26855ce9bcd3cf47b128569296ff6f90dd9b:/build/bakefiles/common.bkl
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index d0efe6ec53..039c0ae34e 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -3,7 +3,7 @@
<makefile>
- <requires version="0.1.4"/>
+ <requires version="0.1.7"/>
<!-- bakefile modules we need: -->
<using module="datafiles"/>
@@ -22,6 +22,9 @@
<set var="PLATFORM_MACOS">0</set>
</if>
+ <!-- FIXME: PalmOS is another candidate to bakefiles -->
+ <set var="PLATFORM_PALMOS">0</set>
+
<include file="config.bkl"/>
<include file="plugins_deps.bkl"/>
@@ -145,12 +148,18 @@
<set var="WXLIB_NET">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('net')))</if>
</set>
+ <set var="WXLIB_QA">
+ <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('qa')))</if>
+ </set>
<set var="WXLIB_CORE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
</set>
<set var="WXLIB_ADV">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if>
</set>
+ <set var="WXLIB_MEDIA">
+ <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('media')))</if>
+ </set>
<set var="WXLIB_HTML">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
</set>
@@ -201,13 +210,15 @@
<set var="BUILDDIR">$(OBJS)</set>
</if>
+ <set var="LIBTYPE_SUFFIX" make_var="1">
+ <if cond="FORMAT!='autoconf' and SHARED=='0'">lib</if>
+ <if cond="FORMAT!='autoconf' and SHARED=='1'">dll</if>
+ </set>
+
<set var="LIBDIRNAME" make_var="1">
<if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
- <if cond="FORMAT!='autoconf' and SHARED=='0'">
- $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_lib$(CFG)
- </if>
- <if cond="FORMAT!='autoconf' and SHARED=='1'">
- $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_dll$(CFG)
+ <if cond="FORMAT!='autoconf'">
+ $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
</if>
</set>
@@ -230,7 +241,8 @@
<if cond="DEBUG_INFO=='0'">off</if>
</set>
<set var="DEBUGRUNTIME">
- <if cond="DEBUG_RUNTIME_LIBS=='default'">$(DEBUGINFO)</if>
+ <if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='debug'">on</if>
+ <if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='release'">off</if>
<if cond="DEBUG_RUNTIME_LIBS=='0'">off</if>
<if cond="DEBUG_RUNTIME_LIBS=='1'">on</if>
</set>
@@ -242,6 +254,24 @@
<if cond="USE_EXCEPTIONS=='1'">on</if>
<if cond="USE_EXCEPTIONS=='0'">off</if>
</set>
+ <set var="RTTIFLAG">
+ <if cond="USE_RTTI=='1'">on</if>
+ <if cond="USE_RTTI=='0'">off</if>
+ </set>
+ <set var="THREADSFLAG">
+ <if cond="USE_THREADS=='1'">multi</if>
+ <if cond="USE_THREADS=='0'">single</if>
+ </set>
+
+ <set var="RTTI_DEFINE">
+ <if cond="USE_RTTI=='0'">wxNO_RTTI</if>
+ </set>
+ <set var="EXCEPTIONS_DEFINE">
+ <if cond="USE_EXCEPTIONS=='0'">wxNO_EXCEPTIONS</if>
+ </set>
+ <set var="THREAD_DEFINE">
+ <if cond="USE_THREADS=='0'">wxNO_THREADS</if>
+ </set>
<set var="DEBUG_DEFINE">
<if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
@@ -256,6 +286,11 @@
<if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
</set>
+ <!-- fill for the specific case of the format/compiler -->
+ <set var="WIN32_WINNT">
+ <if cond="FORMAT=='dmars' or FORMAT=='dmars_smake'">_WIN32_WINNT=0x0400</if>
+ </set>
+
<set var="UNICOWS_LIB">
<if cond="MSLU=='1'">unicows</if>
</set>
@@ -264,14 +299,15 @@
<debug-info>$(DEBUGINFO)</debug-info>
<debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs>
<optimize>$(OPTIMIZEFLAG)</optimize>
- <threading>multi</threading>
+ <threading>$(THREADSFLAG)</threading>
<runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
- <cxx-rtti>$(EXCEPTIONSFLAG)</cxx-rtti>
+ <cxx-rtti>$(RTTIFLAG)</cxx-rtti>
<cxx-exceptions>$(EXCEPTIONSFLAG)</cxx-exceptions>
<if cond="FORMAT!='autoconf'">
<cppflags>$(EXTRACFLAGS)</cppflags>
</if>
<define>$(NO_VC_CRTDBG)</define>
+ <define>$(WIN32_WINNT)</define>
</template>
<template id="anylib">
@@ -372,6 +408,9 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
<define>__WX$(TOOLKIT)__</define>
<define>$(WXUNIV_DEFINE)</define>
<define>$(DEBUG_DEFINE)</define>
+ <define>$(EXCEPTIONS_DEFINE)</define>
+ <define>$(RTTI_DEFINE)</define>
+ <define>$(THREAD_DEFINE)</define>
<define>$(UNICODE_DEFINE)</define>
<!-- this include is added by configure, we need to put other
includes before it: -->
@@ -385,6 +424,9 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
-wcd=657 <!-- define this function inside its class definition (could have improved code quality) -->
-wcd=667 <!-- 'va_start' macro will not work without an argument before '...' -->
</cppflags-watcom>
+ <cxxflags-mingw>
+ -Wno-ctor-dtor-privacy <!-- only defines a private destructor and has no friends -->
+ </cxxflags-mingw>
</template>
<!-- for both GUI and wxBase libs/samples: -->
@@ -463,19 +505,18 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
<libname>$(WXLIBNAME)</libname>
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
- <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
+ <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','WINCE']">
<sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
<precomp-headers-gen>
$(WXTOPDIR)src/msw/dummy.cpp
</precomp-headers-gen>
</if>
+ <precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location>
<precomp-headers-header>wx/wxprec.h</precomp-headers-header>
<precomp-headers>on</precomp-headers>
<precomp-headers-file>wxprec_$(id)</precomp-headers-file>
<precomp-headers-exclude>
src/common/extended.c
- src/msw/gsocket.cpp
- src/msw/gsockmsw.cpp
</precomp-headers-exclude>
</if>
@@ -500,22 +541,39 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
<version>$(WX_VERSION)</version>
<so_version>$(WXSOVERSION)</so_version>
<mac_version>$(WXMACVERSION)</mac_version>
+
+ <!-- version info resources: -->
+ <if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
+ <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
+ <res-include cond="FORMAT=='autoconf'">
+ $(TOP_SRCDIR)include
+ </res-include>
+ </if>
+ <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
</template>
- <template id="wx_3rdparty_dependencies">
+ <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">
<depends>wxtiff</depends>
<depends>wxjpeg</depends>
<depends>wxpng</depends>
+ </template>
+
+ <template id="wx_3rdparty_dependencies"
+ template="wx_3rdparty_dependencies_gui">
<depends>wxexpat</depends>
<depends>wxzlib</depends>
<depends cond="FORMAT=='autoconf'">wxodbc</depends>
<depends>wxregex</depends>
</template>
- <template id="wx_3rdparty_includes">
+ <template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
<include>$(INC_TIFF)</include>
<include>$(INC_JPEG)</include>
<include>$(INC_PNG)</include>
+ </template>
+
+ <template id="wx_3rdparty_includes"
+ template="wx_3rdparty_includes_gui">
<include>$(INC_ZLIB)</include>
<include>$(INC_ODBC)</include>
<include>$(INC_REGEX)</include>