<!-- wxWidgets version numbers logic: -->
<include file="version.bkl"/>
+ <set var="ARCH_SUFFIX">
+ <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
+ <if cond="TARGET_CPU=='amd64'">_x64</if>
+ <if cond="TARGET_CPU=='AMD64'">_x64</if>
+ <if cond="TARGET_CPU=='ia64'">_ia64</if>
+ <if cond="TARGET_CPU=='IA64'">_ia64</if>
+ <if cond="TARGET_CPU=='x64'">_x64</if>
+ <if cond="TARGET_CPU=='X64'">_x64</if>
+ </set>
+
<!-- ================================================================== -->
<!-- Names of libraries and DLLs: -->
<!-- ================================================================== -->
<if cond="TOOLKIT=='MAC'">_carbon</if>
</set>
+ <!--
+ Optional compiler version, mainly for Windows compilers for which it is
+ supposed to be set on make command line for the official builds.
+ -->
+ <set var="COMPILER_VERSION" make_var="1">
+ <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'">ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD</if>
+ </set>
+
<set var="COMPILERORGCC">
<if cond="isdefined('COMPILER')">$(COMPILER)</if>
<if cond="not isdefined('COMPILER')">gcc</if>
</set>
+
+ <!--
+ In the official builds we use not only the compiler name but also its
+ version and architecture we compile for in the libraries names.
+ -->
<set var="WXCOMPILER">
- <if cond="PLATFORM_WIN32=='1'">_$(COMPILERORGCC)</if>
+ <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'">_$(COMPILERORGCC)$(COMPILER_VERSION)$(ARCH_SUFFIX)</if>
+ <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(COMPILERORGCC)</if>
</set>
<set var="VENDORTAG">
<!-- Where to store built libraries and objects: -->
<!-- =============================================================== -->
- <set var="ARCH_SUFFIX">
- <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
- <if cond="TARGET_CPU=='amd64'">_amd64</if>
- <if cond="TARGET_CPU=='AMD64'">_amd64</if>
- <if cond="TARGET_CPU=='ia64'">_ia64</if>
- <if cond="TARGET_CPU=='IA64'">_ia64</if>
- </set>
-
<if cond="FORMAT!='autoconf'">
<set var="WXDLLFLAG">
<if cond="SHARED=='1'">dll</if>
<set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
<set var="OBJS" make_var="1">
- $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(ARCH_SUFFIX)
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(CFG_NAME_PART)$(ARCH_SUFFIX)
</set>
<set var="BUILDDIR">$(OBJS)</set>
<set var="LIBDIRNAME" make_var="1">
<if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if>
<if cond="FORMAT!='autoconf'">
- $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+ $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
</if>
</set>
<if cond="TARGET_CPU=='AMD64'">/MACHINE:X64</if>
<if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
<if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
+ <if cond="TARGET_CPU=='x64'">/MACHINE:X64</if>
+ <if cond="TARGET_CPU=='X64'">/MACHINE:X64</if>
</set>
<template id="common_settings">
$(msvc_copy_setup_h_script % 'msw\setup.h')
</if>
</set>
+ <set var="_custom_build_include_wx_gtk_setup_h">
+ <if cond="WXUNIV=='0' and TOOLKIT=='GTK'">
+ $(msvc_copy_setup_h_script % 'gtk\setup.h')
+ </if>
+ </set>
<set var="_custom_build_include_wx_univ_setup_h">
<if cond="WXUNIV=='1'">
$(msvc_copy_setup_h_script % 'univ\setup.h')
<if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
</set>
+ <!-- GTK+ under Windows requires -mms-bitfields gcc switch -->
+ <set var="CXXFLAGS_GTK_WINDOWS_GCC">
+ <if cond="TOOLKIT=='GTK' and FORMAT=='mingw'">-mms-bitfields</if>
+ </set>
+
<template id="wx" template="common_settings">
<set var="wxid">$(wxwin.mk_wxid(id))</set>
<define>__WX$(TOOLKIT)__</define>
</cppflags-watcom>
<cxxflags-mingw>
-Wno-ctor-dtor-privacy <!-- only defines a private destructor and has no friends -->
+ $(CXXFLAGS_GTK_WINDOWS_GCC)
</cxxflags-mingw>
</template>
</if>
</template>
+ <set var="LIB_GTK">
+ <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1' and TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib glib-2.0.lib</if>
+ </set>
<!-- for GUI libs/samples: -->
<template id="wx_append_nomono" template_append="wx_append_base_nomono">
<sys-lib>$(LIB_TIFF)</sys-lib>
<sys-lib>$(LIB_JPEG)</sys-lib>
<sys-lib>$(LIB_PNG)</sys-lib>
+ <ldlibs>$(LIB_GTK)</ldlibs>
<ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
</template>
<if cond="MONOLITHIC=='1'">$(LIB_PNG)</if>
</set>
+ <set var="LIB_SCINTILLA_IF_MONO">
+ <if cond="MONOLITHIC=='1' and USE_STC=='1'">$(LIB_SCINTILLA)</if>
+ </set>
+
<template id="wx_append_base" template_append="wx_append_base_nomono">
<!-- Always link against the full wx library in monolithic build and
also against the PNG one as core code references it for Tango
<template id="wx_append" template_append="wx_append_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
+ <sys-lib>$(LIB_SCINTILLA_IF_MONO)</sys-lib>
</template>
<if cond="IS_MSVC_PRJ=='1' and BUILDING_LIB=='1'">
<msvc-file-group>Common Sources:src/common/*</msvc-file-group>
+ <msvc-file-group>GTK+ Sources:src/gtk/*</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>GTK+ Headers:*wx/gtk/*.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>
<postlink-command>$(DYLIB_RPATH_POSTLINK)</postlink-command>
</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