<makefile>
- <requires version="0.1.4"/>
+ <requires version="0.1.7"/>
<!-- bakefile modules we need: -->
<using module="datafiles"/>
<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="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">
- $(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 var="WXSOVERSION">
- <if cond="WX_STABLE_BRANCH=='1'">0.0.0</if>
- <if cond="WX_STABLE_BRANCH=='0'">$(WXVER_RELEASE).0.0</if>
- </set>
- <set var="WXMACVERSION">$(WX_VERSION)</set>
- <set var="WXWIN32DLLVERSION">
- <if cond="WX_STABLE_BRANCH=='1'">$(WX_RELEASE_NODOT)</if>
- <if cond="WX_STABLE_BRANCH=='0'">$(WX_VERSION_NODOT)</if>
- </set>
+ <!-- wxWidgets version numbers logic: -->
+ <include file="version.bkl"/>
<!-- ================================================================== -->
<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="BUILDDIR">$(OBJS)</set>
</if>
+ <set var="LIBTYPE_SUFFIX" make_var="1">
+ <if cond="FORMAT!='autoconf' and SHARED=='0' and PLATFORM_WIN32=='1'">lib</if>
+ <if cond="FORMAT!='autoconf' and SHARED=='1' and PLATFORM_WIN32=='1'">dll</if>
+ <if cond="FORMAT=='watcom' and SHARED=='0' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_lib</if>
+ <if cond="FORMAT=='watcom' and SHARED=='1' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_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="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>
<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>
+ <if cond="FORMAT=='msevc4prj'">
+ <!-- hack to make eVC4 default project still compatible with eVC3 environment -->
+ <set var="_ldlibs">$(_ldlibs.replace('ccrtrtti.lib', ''))</set>
+ </if>
</template>
<template id="anylib">
<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>
<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: -->
-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: -->
<ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
+ <!-- system libraries on os2: -->
+ <if cond="FORMAT!='autoconf' and PLATFORM_OS2=='1'">
+ <if cond="FORMAT=='watcom'">
+ <sys-lib>upm32</sys-lib>
+ </if>
+ </if>
+
<!-- system libraries on windows: -->
- <if cond="FORMAT!='autoconf'">
+ <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
<sys-lib>$(UNICOWS_LIB)</sys-lib>
<if cond="FORMAT=='borland'">
<sys-lib>ole2w32</sys-lib>
<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>
<dllname>$(WXDLLNAME)</dllname>
<version>$(WX_VERSION)</version>
<so_version>$(WXSOVERSION)</so_version>
- <mac_version>$(WXMACVERSION)</mac_version>
+
+ <!-- FIXME: until libtool scheme is implemented in bakefile -->
+ <ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>
+
+ <!-- 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_gui" cond="USE_GUI=='1'">
projects / wxWidgets.git / blobdiff