<set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set>
<set var="WX_VERSION">$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)</set>
- <set var="WXSOVERSION">0.0.0</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'">$(WXVER_MAJOR)$(WXVER_MINOR)</if>
+ <if cond="WX_STABLE_BRANCH=='0'">$(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)</if>
+ </set>
<!-- ================================================================== -->
<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="COMPILERORGCC">
<if cond="isdefined('COMPILER')">$(COMPILER)</if>
</set>
<if cond="FORMAT=='autoconf'">
- <set var="WXNAMEPREFIX">wx_base</set>
+ <set var="WXNAMEPREFIX">wx_base$(WXBASEPORT)</set>
<set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
<set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set>
</if>
<if cond="FORMAT!='autoconf'">
- <set var="WXNAMEPREFIX">wxbase$(WXVER_MAJOR)$(WXVER_MINOR)</set>
- <set var="WXNAMEPREFIXGUI">wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>
+ <set var="WXNAMEPREFIX">
+ wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR)
+ </set>
+ <set var="WXNAMEPREFIXGUI">
+ wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>
<set var="WXVERSIONTAG"></set>
</if>
<set var="WXDLLNAMEPREFIX">
- <if cond="PLATFORM_WIN32=='1'">wxbase$(WXVER_MAJOR)$(WXVER_MINOR)</if>
+ <if cond="PLATFORM_WIN32=='1'">
+ wxbase$(WXBASEPORT)$(WXWIN32DLLVERSION)
+ </if>
<if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIX)</if>
</set>
<set var="WXDLLNAMEPREFIXGUI">
<if cond="PLATFORM_WIN32=='1'">
- wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)
+ wx$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION)
</if>
<if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIXGUI)</if>
</set>
<if cond="PLATFORM_WIN32=='0'">$(WXVERSIONTAG)</if>
</set>
- <set var="TOOLCHAIN_NAME">
- $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR)
- </set>
-
<!-- =============================================================== -->
<!-- Names of component libraries: -->
<set var="WXLIB_BASE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
</set>
+ <set var="WXLIB_NET">
+ <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('net')))</if>
+ </set>
<set var="WXLIB_CORE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</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_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
<set var="BUILDDIR">$(OBJS)</set>
</if>
- <set var="LIBDIRNAME">
+ <set var="LIBDIRNAME" make_var="1">
<if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
<if cond="FORMAT!='autoconf'">
- $(TOP_SRCDIR)lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART)
+ $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART)
</if>
</set>
<set var="UNICODE_DEFINE">
<if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if>
</set>
-
- <template id="anylib">
- <depends cond="FORMAT!='autoconf' and BUILDING_LIB=='1'">setup.h</depends>
- <dirname>$(LIBDIRNAME)</dirname>
- <install-to>$(LIBDIR)</install-to>
-
+
+ <template id="common_settings">
<debug-info>$(DEBUGFLAG)</debug-info>
<optimize>$(OPTIMIZEFLAG)</optimize>
<threading>multi</threading>
- <runtime-libs>dynamic</runtime-libs>
-
+ <runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
<if cond="FORMAT!='autoconf'">
- <define>WINVER=0x0400</define>
- <define>_WIN32_IE=0x0400</define>
- <define>STRICT</define>
<cppflags>$(EXTRACFLAGS)</cppflags>
</if>
-
+ </template>
+
+ <template id="anylib">
+ <dirname>$(LIBDIRNAME)</dirname>
+ <install-to>$(LIBDIR)</install-to>
</template>
- <template id="3rdparty_lib" template="anylib">
- <libname>$(id)$(WXDEBUGFLAG)</libname>
+ <template id="3rdparty_lib" template="common_settings,anylib">
+ <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
</template>
<include file="jpeg.bkl"/>
<include file="tiff.bkl"/>
<include file="odbc.bkl"/>
+ <include file="expat.bkl"/>
<!-- =============================================================== -->
<!-- Templates for wxWindows libs: -->
<!-- =============================================================== -->
- <template id="wx">
+ <template id="wx" template="common_settings">
<set var="wxid">$(wxwin.mk_wxid(id))</set>
<define>__WX$(TOOLKIT)__</define>
<define>$(WXUNIV_DEFINE)</define>
<include>$(INC_ZLIB)</include>
<include>$(INC_ODBC)</include>
<include>$(INC_REGEX)</include>
+ <include>$(INC_EXPAT)</include>
</template>
- <template id="wx_append">
+ <!-- for both GUI and wxBase libs/samples: -->
+ <template id="wx_append_base_nomono">
<!-- link against builtin 3rd party libs, if needed: -->
<sys-lib>$(LIB_TIFF)</sys-lib>
<sys-lib>$(LIB_JPEG)</sys-lib>
<sys-lib>$(LIB_ZLIB)</sys-lib>
<sys-lib>$(LIB_ODBC)</sys-lib>
<sys-lib>$(LIB_REGEX)</sys-lib>
+ <sys-lib>$(LIB_EXPAT)</sys-lib>
<ldlibs>$(EXTRALIBS)</ldlibs>
</if>
</template>
+ <define-tag name="msvc-headers" rules="dll,lib">
+ <if cond="FORMAT=='msvc6prj'">
+ <msvc-project-files>
+ $(addPrefixToList('include\', wxwin.headersOnly(value)))
+ </msvc-project-files>
+ </if>
+ </define-tag>
+
+ <define-tag name="msvc-copy-setup-h" rules="dll,lib">
+ <if cond="FORMAT=='msvc6prj'">
+ <msvc-headers>wx/msw/setup.h</msvc-headers>
+ <set var="__custom_build_files" append="1">
+ include\wx\msw\setup.h
+ </set>
+ <set var="__custom_build_include_wx_msw_setup_h">
+Creating $(LIBDIRNAME)\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"$(LIBDIRNAME)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
+$(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
+ </set>
+ </if>
+ </define-tag>
+
+
+ <!-- for GUI libs/samples: -->
+ <template id="wx_append_nomono" template="wx_append_base_nomono">
+ <ldlibs>$(EXTRALIBS_GUI)</ldlibs>
+ </template>
+
+
+ <template id="wx_append_base" template_append="wx_append_base_nomono">
+ <!-- Always link against the wxWin library in monolithic build: -->
+ <sys-lib>$(WXLIB_MONO)</sys-lib>
+ </template>
+ <template id="wx_append" template_append="wx_append_nomono">
+ <!-- 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="FORMAT!='autoconf'">
- <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
- <precomp-headers-gen>
- $(WXTOPDIR)src/msw/dummy.cpp
- </precomp-headers-gen>
+ <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
+ <if cond="FORMAT!='autoconf'">
+ <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
+ <precomp-headers-gen>
+ $(WXTOPDIR)src/msw/dummy.cpp
+ </precomp-headers-gen>
+ </if>
+ <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.c
+ src/msw/gsockmsw.c
+ </precomp-headers-exclude>
+ </if>
+
+ <if cond="FORMAT=='msvc6prj' 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>
+ <msvc-file-group>wxUniv Sources:src/univ/*</msvc-file-group>
+ <msvc-file-group>wxHTML Sources:src/html/*</msvc-file-group>
+ <msvc-file-group>Setup Headers:*/setup.h</msvc-file-group>
+ <msvc-file-group>Common Headers:*wx/[!/]*.h</msvc-file-group>
+ <msvc-file-group>MSW Headers:*wx/msw/*.h</msvc-file-group>
+ <msvc-file-group>Generic Headers:*wx/generic/*.h</msvc-file-group>
+ <msvc-file-group>wxUniv Headers:*wx/univ/*.h</msvc-file-group>
+ <msvc-file-group>wxHTML Headers:*wx/html/*.h</msvc-file-group>
</if>
- <precomp-headers-header>wx/wxprec.h</precomp-headers-header>
- <precomp-headers>on</precomp-headers>
- <precomp-headers-file>wxprec_$(id)</precomp-headers-file>
</template>
<template id="wx_dll_b" template="wx_lib_b">
</template>
<template id="wx_lib" template="wx_lib_b"/>
- <template id="wx_dll" template="wx_dll_b" template_append="wx_append">
+ <template id="wx_base_lib" template="wx_lib_b"/>
+ <template id="wx_dll" template="wx_dll_b"
+ template_append="wx_append_nomono">
+ <depends>wxtiff</depends>
+ <depends>wxjpeg</depends>
+ <depends>wxpng</depends>
+ <depends>wxexpat</depends>
+ <depends>wxzlib</depends>
+ <depends cond="FORMAT=='autoconf'">wxodbc</depends>
+ <depends>wxregex</depends>
+ </template>
+ <template id="wx_base_dll" template="wx_dll_b"
+ template_append="wx_append_base_nomono">
<depends>wxtiff</depends>
<depends>wxjpeg</depends>
<depends>wxpng</depends>
+ <depends>wxexpat</depends>
<depends>wxzlib</depends>
<depends cond="FORMAT=='autoconf'">wxodbc</depends>
<depends>wxregex</depends>
projects / wxWidgets.git / blobdiff