<set var="WXCOMPILER">
<if cond="PLATFORM_WIN32=='1'">_$(COMPILERORGCC)</if>
</set>
-
+
+ <set var="VENDORTAG">
+ <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'"></if>
+ <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(VENDOR)</if>
+ </set>
+
<set var="WXDEBUGFLAG">
<if cond="BUILD=='debug'">d</if>
</set>
</set>
<if cond="FORMAT=='autoconf'">
- <set var="WXNAMEPREFIX">wx</set>
+ <set var="WXNAMEPREFIX">wx_base</set>
<set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
<set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set>
</if>
<if cond="FORMAT!='autoconf'">
- <set var="WXNAMEPREFIX">wx$(WXVER_MAJOR)$(WXVER_MINOR)</set>
+ <set var="WXNAMEPREFIX">wxbase$(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=='0'">$(WXNAMEPREFIX)</if>
+ </set>
+ <set var="WXDLLNAMEPREFIXGUI">
+ <if cond="PLATFORM_WIN32=='1'">
+ wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)
+ </if>
+ <if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIXGUI)</if>
+ </set>
+ <set var="WXDLLVERSIONTAG">
+ <if cond="PLATFORM_WIN32=='1'"></if>
+ <if cond="PLATFORM_WIN32=='0'">$(WXVERSIONTAG)</if>
+ </set>
<set var="TOOLCHAIN_NAME">
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR)
<!-- =============================================================== -->
- <!-- Where to store built libraries: -->
+ <!-- Where to store built libraries and objects: -->
<!-- =============================================================== -->
+
+ <if cond="FORMAT!='autoconf'">
+ <set var="WXDLLFLAG">
+ <if cond="SHARED=='1'">dll</if>
+ </set>
+ <set var="CFG_NAME_PART">
+ $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+ </set>
+ <set var="OBJS" make_var="1">$(COMPILER)_$(CFG_NAME_PART)</set>
+ <set var="BUILDDIR">$(OBJS)</set>
+ </if>
+
<set var="LIBDIRNAME">
<if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
- <if cond="FORMAT!='autoconf'">$(TOP_SRCDIR)lib$(DIRSEP)$(COMPILER)</if>
+ <if cond="FORMAT!='autoconf'">
+ $(TOP_SRCDIR)lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART)
+ </if>
</set>
+
<!-- =============================================================== -->
<!-- Templates for libs: -->
<if cond="BUILD=='debug'">off</if>
<if cond="BUILD=='release'">speed</if>
</set>
+
+ <set var="DEBUG_DEFINE">
+ <if cond="FORMAT!='autoconf' and BUILD=='debug'">__WXDEBUG__</if>
+ </set>
+ <set var="UNICODE_DEFINE">
+ <if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if>
+ </set>
+
+ <template id="anything">
+ <debug-info>$(DEBUGFLAG)</debug-info>
+ <optimize>$(OPTIMIZEFLAG)</optimize>
+ <threading>multi</threading>
+ <runtime-libs>dynamic</runtime-libs>
+ <if cond="FORMAT!='autoconf'">
+ <cppflags>$(EXTRACFLAGS)</cppflags>
+ </if>
+ </template>
<template id="anylib">
<depends cond="FORMAT!='autoconf' and BUILDING_LIB=='1'">setup.h</depends>
<dirname>$(LIBDIRNAME)</dirname>
<install-to>$(LIBDIR)</install-to>
-
- <debug-info>$(DEBUGFLAG)</debug-info>
- <optimize>$(OPTIMIZEFLAG)</optimize>
- <threading>multi</threading>
+ <if cond="FORMAT!='autoconf'">
+ <cppflags>$(EXTRACFLAGS)</cppflags>
+ </if>
</template>
<template id="3rdparty_lib" template="anylib">
<!-- Templates for wxWindows libs: -->
<!-- =============================================================== -->
- <template id="wx">
+ <template id="wx" template="anything">
<set var="wxid">$(wxwin.mk_wxid(id))</set>
<define>__WX$(TOOLKIT)__</define>
<define>$(WXUNIV_DEFINE)</define>
+ <define>$(DEBUG_DEFINE)</define>
+ <define>$(UNICODE_DEFINE)</define>
<include>$(TOP_SRCDIR)include</include>
<lib-path>$(LIBDIRNAME)</lib-path>
<include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>
</template>
<template id="wx_append">
- <ldlibs>$(EXTRALIBS)</ldlibs>
<!-- 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>
+
+ <ldlibs>$(EXTRALIBS)</ldlibs>
+
+ <!-- system libraries on windows: -->
+ <if cond="FORMAT!='autoconf'">
+ <if cond="COMPILER=='bcc'">
+ <sys-lib>import32</sys-lib>
+ <sys-lib>ole2w32</sys-lib>
+ </if>
+ <if cond="COMPILER!='bcc'">
+ <sys-lib>kernel32</sys-lib>
+ <sys-lib>user32</sys-lib>
+ <sys-lib>gdi32</sys-lib>
+ <sys-lib>comdlg32</sys-lib>
+ <sys-lib>winspool</sys-lib>
+ <sys-lib>winmm</sys-lib>
+ <sys-lib>shell32</sys-lib>
+ <sys-lib>comctl32</sys-lib>
+ <sys-lib>odbc32</sys-lib>
+ <sys-lib>ole32</sys-lib>
+ <sys-lib>oleaut32</sys-lib>
+ <sys-lib>uuid</sys-lib>
+ <sys-lib>rpcrt4</sys-lib>
+ <sys-lib>advapi32</sys-lib>
+ <sys-lib>wsock32</sys-lib>
+ </if>
+ </if>
</template>
<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>
+ <precomp-headers-header>wx/wxprec.h</precomp-headers-header>
<precomp-headers>on</precomp-headers>
- <precomp-headers-file>wxprec</precomp-headers-file>
+ <precomp-headers-file>wxprec_$(id)</precomp-headers-file>
</template>
-
+
<template id="wx_dll_b" template="wx_lib_b">
<set var="WXDLLNAME">$(wxwin.mkDllName(wxid))</set>
<dllname>$(WXDLLNAME)</dllname>
</template>
<template id="wx_lib" template="wx_lib_b"/>
- <template id="wx_dll" template="wx_dll_b" template_append="wx_append"/>
+ <template id="wx_dll" template="wx_dll_b" template_append="wx_append">
+ <depends>wxtiff</depends>
+ <depends>wxjpeg</depends>
+ <depends>wxpng</depends>
+ <depends>wxzlib</depends>
+ <depends cond="FORMAT=='autoconf'">wxodbc</depends>
+ <depends>wxregex</depends>
+ </template>
<!-- =============================================================== -->
<!-- Support for wxWindows samples and contrib: -->
projects / wxWidgets.git / blobdiff