<makefile>
- <requires version="0.1.3"/>
- <!-- FIXME: remove this kludge when upgraded to 0.1.4: -->
- <if cond="BAKEFILE_VERSION=='0.1.3'">
- <define-tag name="pic" rules="exe,dll,lib,module"/>
- </if>
+ <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 -->
+ <option name="PLATFORM_MACOS"/>
+
<include file="config.bkl"/>
<include file="plugins_deps.bkl"/>
<!-- ================================================================== -->
- <!-- wxWindows version numbers: -->
+ <!-- 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>
<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="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">
<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')))
</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 wxWindows; otherwise they are embedded in shared libs:
+ version of wxWidgets; otherwise they are embedded in shared libs:
-->
<install-if>SHARED=='0'</install-if>
<pic>$(substituteFromDict(SHARED, {'0':'off', '1':'on'}))</pic>
"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</set>
- <!-- FIXME: temporary kludge! remove after upgrade to 0.1.4 -->
- <if cond="FORMAT=='msvc6prj'">
- <set var="__custom_build_files">
- $(_custom_build_files)
- </set>
- <set var="__custom_build_include_wx_msw_setup_h">
- $(_custom_build_include_wx_msw_setup_h)
- </set>
- </if>
</if>
</define-tag>
<!-- =============================================================== -->
- <!-- Templates for wxWindows libs: -->
+ <!-- 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>
<lib-path>$(LIBDIRNAME)</lib-path>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<warnings>max</warnings>
+ <cppflags-watcom>-wcd=549 -wcd=656 -wcd=657</cppflags-watcom>
</template>
<!-- for both GUI and wxBase libs/samples: -->
<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'">
<if cond="FORMAT=='borland'">
<sys-lib>ole2w32</sys-lib>
</if>
- <if cond="FORMAT!='borland'">
+ <if cond="FORMAT=='msevc4prj'">
+ <sys-lib>ole32</sys-lib>
+ <sys-lib>oleaut32</sys-lib>
+ <sys-lib>uuid</sys-lib>
+ <sys-lib>commctrl</sys-lib>
+ <sys-lib>winsock</sys-lib>
+ <sys-lib>wininet</sys-lib>
+ </if>
+ <if cond="FORMAT!='borland' and FORMAT!='msevc4prj'">
<sys-lib>kernel32</sys-lib>
<sys-lib>user32</sys-lib>
<sys-lib>gdi32</sys-lib>
<if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
<sys-lib>oleacc</sys-lib>
</if>
- <sys-lib>odbc32</sys-lib>
+ <if cond="FORMAT!='msevc4prj'">
+ <sys-lib>odbc32</sys-lib>
+ </if>
</if>
</template>
<!-- for GUI libs/samples: -->
<template id="wx_append_nomono" template="wx_append_base_nomono">
- <ldlibs>$(EXTRALIBS_GUI)</ldlibs>
+ <ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
</template>
<libname>$(WXLIBNAME)</libname>
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
- <if cond="FORMAT!='autoconf'">
+ <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
<sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
<precomp-headers-gen>
$(WXTOPDIR)src/msw/dummy.cpp
<precomp-headers-exclude>
src/common/unzip.c
src/common/extended.c
- src/msw/gsocket.c
- src/msw/gsockmsw.c
+ src/msw/gsocket.cpp
+ src/msw/gsockmsw.cpp
</precomp-headers-exclude>
</if>
- <if cond="IS_MSVC_PRJ and BUILDING_LIB=='1'">
+ <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>
<msvc-file-group>Generic Sources:src/generic/*</msvc-file-group>
</template>
<!-- =============================================================== -->
- <!-- Templates for building wxWindows plugins: -->
+ <!-- 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">
<set var="PLUGINSUFFIX">
<if cond="UNICODE=='0' and BUILD=='release'"></if>
- <if cond="UNICODE=='0' and BUILD=='debug'">_d</if>
- <if cond="UNICODE=='1' and BUILD=='release'">_u</if>
- <if cond="UNICODE=='1' and BUILD=='debug'">_ud</if>
+ <if cond="UNICODE=='0' and BUILD=='debug'">d</if>
+ <if cond="UNICODE=='1' and BUILD=='release'">u</if>
+ <if cond="UNICODE=='1' and BUILD=='debug'">ud</if>
</set>
<set var="PLUGINS_INST_DIR" make_var="1">
</define-rule>
<!-- =============================================================== -->
- <!-- Support for wxWindows samples and contrib: -->
+ <!-- Support for wxWidgets samples and contrib: -->
<!-- =============================================================== -->
<!-- Link against one wxWin library. Value must be literal! -->
<define-tag name="wx-lib" rules="exe,dll,module">
<sys-lib>$(wxwin.libToLink(value))</sys-lib>
<ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
- <if cond="IS_MSVC_PRJ and MONOLITHIC=='0'">
+ <if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
<depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
</if>
</define-tag>
projects / wxWidgets.git / blobdiff