<makefile>
<requires version="0.1.4"/>
-
+
<!-- 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>
+
<include file="config.bkl"/>
<include file="plugins_deps.bkl"/>
-
+
<!-- ================================================================== -->
<!-- wxWidgets version numbers: -->
<!-- ================================================================== -->
<set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set>
<set var="WXVER_MINOR">$(wxwin.getVersionMinor())</set>
<set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set>
+ <set var="WX_RELEASE" make_var="1">
+ $(WXVER_MAJOR).$(WXVER_MINOR)
+ </set>
+ <set var="WX_RELEASE_NODOT" make_var="1">
+ $(WXVER_MAJOR)$(WXVER_MINOR)
+ </set>
<set var="WX_VERSION" make_var="1">
- $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
+ $(WX_RELEASE).$(WXVER_RELEASE)
+ </set>
+ <set var="WX_VERSION_NODOT" make_var="1">
+ $(WX_RELEASE_NODOT)$(WXVER_RELEASE)
</set>
<set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>
</set>
<set var="WXMACVERSION">$(WX_VERSION)</set>
<set var="WXWIN32DLLVERSION">
- <if cond="WX_STABLE_BRANCH=='1'">$(WXVER_MAJOR)$(WXVER_MINOR)</if>
- <if cond="WX_STABLE_BRANCH=='0'">$(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)</if>
+ <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>
<if cond="UNICODE=='1' and FORMAT!='msevc4prj'">u</if>
</set>
<set var="WXNAMESUFFIX">
- $(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
</set>
-
+
<set var="WXUNIVNAME">
<if cond="WXUNIV=='1'">univ</if>
</set>
<if cond="FORMAT=='autoconf'">
<set var="WXNAMEPREFIX">wx_base$(WXBASEPORT)</set>
<set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
- <set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set>
+ <set var="WXVERSIONTAG">-$(WX_RELEASE)</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="WXNAMEPREFIX">
- wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR)
+ wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)
</set>
<set var="WXNAMEPREFIXGUI">
- wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)</set>
<set var="WXVERSIONTAG"></set>
</if>
<set var="WXDLLNAMEPREFIX">
<if cond="PLATFORM_WIN32=='0'">$(WXVERSIONTAG)</if>
</set>
-
+
<!-- =============================================================== -->
<!-- Names of component libraries: -->
<!-- =============================================================== -->
<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_XML">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xml')))</if>
</set>
+ <set var="WXLIB_XRC">
+ <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xrc')))</if>
+ </set>
<set var="WXLIB_ODBC">
<if cond="MONOLITHIC=='0' and USE_ODBC=='1'">
$(mk.evalExpr(wxwin.mkLibName('odbc')))
<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="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)_dll$(CFG)
</if>
</set>
-
+
<if cond="FORMAT!='autoconf'">
<set var="SETUPHDIR" make_var="1">
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
</set>
</if>
-
-
+
+
<!-- =============================================================== -->
<!-- Templates for libs: -->
<!-- =============================================================== -->
<set var="UNICODE_DEFINE">
<if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
</set>
-
+
<set var="UNICOWS_LIB">
<if cond="MSLU=='1'">unicows</if>
</set>
</if>
<define>$(NO_VC_CRTDBG)</define>
</template>
-
+
<template id="anylib">
<dirname>$(LIBDIRNAME)</dirname>
<install-to>$(LIBDIR)</install-to>
</template>
<template id="3rdparty_lib" template="common_settings,anylib">
- <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
+ <if cond="FORMAT=='autoconf'">
+ <libname>$(id)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname>
+ </if>
+ <if cond="FORMAT!='autoconf'">
+ <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
+ </if>
<!--
we want to install 3rd party libs system-wide only with static
version of wxWidgets; otherwise they are embedded in shared libs:
<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>
<!-- =============================================================== -->
<!-- 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: -->
<!-- =============================================================== -->
+ <!-- NB: in monolithic build, even wxBase-only must be linked against
+ GUI extralibs, otherwise there would be unresolved references.
+ The variables below are defined so that all libs are used
+ in monolithic build, but not in multilib one. -->
+ <set var="EXTRALIBS_FOR_BASE">
+ <if cond="MONOLITHIC=='1'">$(EXTRALIBS) $(EXTRALIBS_GUI)</if>
+ <if cond="MONOLITHIC=='0'">$(EXTRALIBS)</if>
+ </set>
+ <set var="EXTRALIBS_FOR_GUI">
+ <if cond="MONOLITHIC=='1'"></if>
+ <if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
+ </set>
+
<template id="wx" template="common_settings">
<set var="wxid">$(wxwin.mk_wxid(id))</set>
<define>__WX$(TOOLKIT)__</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 <!-- '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>
+ <cppflags-mingw>
+ -Wno-ctor-dtor-privacy <!-- only defines a private destructor and has no friends -->
+ </cppflags-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)</ldlibs>
+
+ <ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
<!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf'">
<!-- for GUI libs/samples: -->
<template id="wx_append_nomono" template="wx_append_base_nomono">
- <ldlibs>$(EXTRALIBS_GUI)</ldlibs>
+ <ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
</template>
<!-- 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>
<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>
<mac_version>$(WXMACVERSION)</mac_version>
</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="WX_STABLE_BRANCH=='1'">
<set var="PLUGIN_VERSION0">
- <if cond="PLATFORM_UNIX=='1'">
- $(WXVER_MAJOR).$(WXVER_MINOR)
- </if>
- <if cond="PLATFORM_UNIX=='0'">
- $(WXVER_MAJOR)$(WXVER_MINOR)
- </if>
+ <if cond="PLATFORM_UNIX=='1'">$(WX_RELEASE)</if>
+ <if cond="PLATFORM_UNIX=='0'">$(WX_RELEASE_NODOT)</if>
</set>
</if>
<if cond="WX_STABLE_BRANCH=='0'">
<set var="PLUGIN_VERSION0">
- <if cond="PLATFORM_UNIX=='1'">
- $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
- </if>
- <if cond="PLATFORM_UNIX=='0'">
- $(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)
- </if>
+ <if cond="PLATFORM_UNIX=='1'">$(WX_VERSION)</if>
+ <if cond="PLATFORM_UNIX=='0'">$(WX_VERSION_NODOT)</if>
</set>
</if>
<set var="PLUGVERDELIM">
<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