<makefile>
- <requires version="0.1.4"/>
-
+ <requires version="0.1.7"/>
+
<!-- bakefile modules we need: -->
<using module="datafiles"/>
<!-- load python module with wxwindows helpers: -->
<using module="wxwin"/>
+ <!-- DFE: Add a platform meaning regular MacOS (not OS X) -->
+ <!-- FIXME: This will be handled in Bakefile but for now I wanted to
+ get my changes to the wx bakefiles in the tree but invisible to
+ windows toolkits and their config.xxx settings -->
+ <if cond="FORMAT=='autoconf'">
+ <option name="PLATFORM_MACOS"/>
+ </if>
+ <if cond="FORMAT!='autoconf'">
+ <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"/>
-
+
<!-- ================================================================== -->
<!-- wxWidgets version numbers: -->
<!-- ================================================================== -->
<set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>
+ <!-- this needs to be reset to 0 on beginning of stable series and
+ increment by one 1 every time binary incompatible change is made
+ (i.e. preferably never) -->
+ <set var="WX_BINARY_VERSION">0</set>
+
<set var="WXSOVERSION">
- <if cond="WX_STABLE_BRANCH=='1'">0.0.0</if>
+ <if cond="WX_STABLE_BRANCH=='1'">$(WX_BINARY_VERSION).0.0</if>
<if cond="WX_STABLE_BRANCH=='0'">$(WXVER_RELEASE).0.0</if>
</set>
<set var="WXMACVERSION">$(WX_VERSION)</set>
<if cond="WX_STABLE_BRANCH=='1'">$(WX_RELEASE_NODOT)</if>
<if cond="WX_STABLE_BRANCH=='0'">$(WX_VERSION_NODOT)</if>
</set>
-
-
+
+
<!-- ================================================================== -->
<!-- Names of libraries and DLLs: -->
<!-- ================================================================== -->
<if cond="USE_GUI=='0'">base</if>
<if cond="USE_GUI=='1'">$(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)</if>
</set>
-
+
<set var="WXBASEPORT">
<if cond="TOOLKIT=='MAC'">_carbon</if>
</set>
<set var="WXNAMESUFFIX">
$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
</set>
-
+
<set var="WXUNIVNAME">
<if cond="WXUNIV=='1'">univ</if>
</set>
<if cond="PLATFORM_WIN32=='0'">$(WXVERSIONTAG)</if>
</set>
-
+
<!-- =============================================================== -->
<!-- Names of component libraries: -->
<!-- =============================================================== -->
<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>
<set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
</set>
-
-
+
+
<!-- =============================================================== -->
<!-- Where to store built libraries and objects: -->
<!-- =============================================================== -->
-
+
<set var="DIR_SUFFIX_CPU">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
</set>
<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>
-
+
<if cond="FORMAT!='autoconf'">
<set var="SETUPHDIR" make_var="1">
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
</set>
</if>
-
-
+
+
<!-- =============================================================== -->
<!-- Templates for libs: -->
<!-- =============================================================== -->
<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>
<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>
<set var="UNICODE_DEFINE">
<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>
<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">
<dirname>$(LIBDIRNAME)</dirname>
<install-to>$(LIBDIR)</install-to>
<install-if>SHARED=='0'</install-if>
<pic>$(substituteFromDict(SHARED, {'0':'off', '1':'on'}))</pic>
</template>
-
-
+
+
<!-- deal with the need to copy setup.h here: -->
<set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set>
<define-tag name="msvc-headers" rules="dll,lib">
<if cond="IS_MSVC_PRJ">
- <msvc-project-files>
- $(addPrefixToList('include\', wxwin.headersOnly(value)))
- </msvc-project-files>
+ <!-- FIXME: remove this once we require >=bkl-0.1.9 -->
+ <if cond="BAKEFILE_VERSION in ['0.1.7', '0.1.8']">
+ <msvc-project-files>
+ $(addPrefixToList('include\', wxwin.headersOnly(value)))
+ </msvc-project-files>
+ </if>
+ <if cond="BAKEFILE_VERSION not in ['0.1.7', '0.1.8']">
+ <msvc-project-files>
+ $(addPrefixToList('include\\', wxwin.headersOnly(value)))
+ </msvc-project-files>
+ </if>
</if>
</define-tag>
<!-- =============================================================== -->
<!-- 3rd party libs: -->
<!-- =============================================================== -->
-
+
<!-- 3rd party libraries: -->
<include file="regex.bkl"/>
<include file="zlib.bkl"/>
<include file="odbc.bkl"/>
<include file="expat.bkl"/>
-
+
<!-- =============================================================== -->
<!-- Templates for wxWidgets libs: -->
<!-- =============================================================== -->
<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: -->
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
- <lib-path>$(LIBDIRNAME)</lib-path>
+ <lib-path>$(LIBDIRNAME)</lib-path>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<warnings>max</warnings>
- <cppflags-watcom>-wcd=549 -wcd=656 -wcd=657</cppflags-watcom>
+ <cppflags-watcom>
+ -wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
+ -wcd=656 <!-- define this function inside its class definition (may improve code quality) -->
+ -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: -->
<sys-lib>$(LIB_ODBC)</sys-lib>
<sys-lib>$(LIB_REGEX)</sys-lib>
<sys-lib>$(LIB_EXPAT)</sys-lib>
-
+
<ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
<!-- system libraries on windows: -->
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
</template>
-
+
<set var="WX_DISABLE_PRECOMP_HEADERS" overwrite="0">0</set>
-
+
<template id="wx_lib_b" template="wx,anylib">
<set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
<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/unzip.c
src/common/extended.c
- src/msw/gsocket.cpp
- src/msw/gsockmsw.cpp
</precomp-headers-exclude>
</if>
-
+
<if cond="IS_MSVC_PRJ=='1' and BUILDING_LIB=='1'">
<msvc-file-group>Common Sources:src/common/*</msvc-file-group>
<msvc-file-group>MSW Sources:src/msw/*</msvc-file-group>
<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>
<include>$(INC_EXPAT)</include>
</template>
-
+
<template id="wx_lib"
template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h"/>
<template id="wx_base_lib"
template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h">
- <define>wxUSE_GUI=0</define>
+ <define>wxUSE_GUI=0</define>
</template>
<template id="wx_dll"
<template id="wx_base_dll"
template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
template_append="msvc_setup_h,wx_append_base_nomono">
- <define>wxUSE_GUI=0</define>
+ <define>wxUSE_GUI=0</define>
</template>
-
+
<!-- =============================================================== -->
<!-- Templates for building wxWidgets plugins: -->
<!-- =============================================================== -->
<if cond="PLATFORM_UNIX=='0'"></if>
</set>
<set var="PLUGIN_VERSION">$(PLUGVERDELIM)$(PLUGIN_VERSION0)</set>
-
+
<set var="PLUGINSUFFIX">
<if cond="UNICODE=='0' and BUILD=='release'"></if>
<if cond="UNICODE=='0' and BUILD=='debug'">d</if>
<install-to>$(PLUGINS_INST_DIR)</install-to>
</template>
</define-rule>
-
+
<define-rule name="wx-gui-plugin" extends="module">
<template template="wx">
<dllname>
<install-to>$(PLUGINS_INST_DIR)</install-to>
</template>
</define-rule>
-
+
<!-- =============================================================== -->
<!-- Support for wxWidgets samples and contrib: -->
<!-- =============================================================== -->
projects / wxWidgets.git / blobdiff