<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 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">
<set var="WXLIB_STC">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
</set>
-
+ <set var="WXLIB_WEBVIEW">
+ <if cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'">$(mk.evalExpr(wxwin.mkLibName('webview')))</if>
+ </set>
<set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
</set>
<!-- Where to store built libraries and objects: -->
<!-- =============================================================== -->
- <set var="DIR_SUFFIX_CPU">
- <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>
$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(WXDLLFLAG)$(CFG)
</set>
- <!-- NB: this is make_var so that it can be overriden on command line
+ <!-- NB: this is make_var so that it can be overridden on command line
like this: nmake -f makefile.vc COMPILER_PREFIX=vc6 -->
<set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
<set var="OBJS" make_var="1">
- $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
+ $(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)$(DIR_SUFFIX_CPU)_$(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">
<if cond="FORMAT!='autoconf'">
<cppflags>$(EXTRACFLAGS)</cppflags>
</if>
+ <!-- Suppress deprecation warnings for standard library calls -->
+ <if cond="FORMAT in ['msvc','msvs2005prj','msvs2008prj']">
+ <define>_CRT_SECURE_NO_DEPRECATE=1</define>
+ <define>_CRT_NON_CONFORMING_SWPRINTFS=1</define>
+ <define>_SCL_SECURE_NO_WARNINGS=1</define>
+ </if>
+
<define>$(NO_VC_CRTDBG)</define>
<define>$(WIN32_WINNT)</define>
<if cond="FORMAT=='msvc'">
</define-tag>
<set var="msvc_copy_setup_h_script">
- <if cond="IS_MSVC_PRJ">
+ <if cond="IS_MSVC_PRJ=='1' and FORMAT not in ['msvc6prj','msevc4prj']">
+Creating $(SETUPHDIR)\wx\setup.h
+InputPath=..\..\include\wx\%s
+
+"$(SETUPHDIR)\wx\setup.h" :
+$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
+ </if>
+ <if cond="IS_MSVC_PRJ=='1' and FORMAT in ['msvc6prj','msevc4prj']">
Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\..\include\wx\%s
</set>
</if>
<if cond="FORMAT!='msevc4prj'">
- <msvc-headers-setup-h>
- msw/setup.h
- univ/setup.h
- </msvc-headers-setup-h>
+ <!-- Unfortunately we have to include wx/univ/setup.h in both
+ cases because WXUNIV==1 is not a weak condition, but at
+ least don't include wxGTK setup.h when building wxMSW. -->
+ <if cond="TOOLKIT=='MSW'">
+ <msvc-headers-setup-h>
+ msw/setup.h
+ univ/setup.h
+ </msvc-headers-setup-h>
+ </if>
+ <if cond="TOOLKIT=='GTK'">
+ <msvc-headers-setup-h>
+ gtk/setup.h
+ univ/setup.h
+ </msvc-headers-setup-h>
+ </if>
<set var="_custom_build_include_wx_msw_setup_h">
- <if cond="WXUNIV=='0'">
+ <if cond="WXUNIV=='0' and TOOLKIT=='MSW'">
$(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')
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=='1'">$(EXTRALIBS) $(EXTRALIBS_XML) $(EXTRALIBS_GUI)</if>
<if cond="MONOLITHIC=='0'">$(EXTRALIBS)</if>
</set>
<set var="EXTRALIBS_FOR_GUI">
<if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
</set>
- <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
- <set var="MGLLIBPATH">$(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10</set>
- <set var="MGLPMLIBPATH">
- <if cond="DOS32=='DOS4GW'">dos4gw</if>
- </set>
- </if>
+ <!-- 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>
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<include cond="FORMAT!='autoconf'">$(CAIRO_INCLUDEDIR)</include>
<lib-path>$(LIBDIRNAME)</lib-path>
- <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
- <lib-path>$(MGLLIBPATH)</lib-path>
- <lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
- </if>
<warnings>max</warnings>
<cxxflags cond="FORMAT=='autoconf'">$(CXXWARNINGS)</cxxflags>
</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>
</if>
- <!-- system libraries on mgl: -->
- <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
- <sys-lib>mgl</sys-lib>
- <sys-lib>mglcpp</sys-lib>
- <sys-lib>pm</sys-lib>
- </if>
-
<!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
<sys-lib>$(UNICOWS_LIB)</sys-lib>
</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>
+ <set var="LIB_PNG_IF_MONO">
+ <if cond="MONOLITHIC=='1'">$(LIB_PNG)</if>
+ </set>
<template id="wx_append_base" template_append="wx_append_base_nomono">
- <!-- Always link against the wxWin library in monolithic build: -->
+ <!-- Always link against the full wx library in monolithic build and
+ also against the PNG one as core code references it for Tango
+ icons and so it is pulled in even by the console programs. -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
+ <sys-lib>$(LIB_PNG_IF_MONO)</sys-lib>
</template>
<template id="wx_append" template_append="wx_append_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
<define>WXBUILDING</define>
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
- <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL','PM','WINCE']">
+ <if cond="FORMAT!='autoconf'">
<sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
<precomp-headers-gen>
$(WXTOPDIR)src/common/dummy.cpp
<precomp-headers-file>wxprec_$(id)</precomp-headers-file>
<precomp-headers-exclude>
src/common/extended.c
+ src/gtk/eggtrayicon.c
+ src/gtk/treeentry_gtk.c
</precomp-headers-exclude>
</if>
<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'">
</template>
<template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
- <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
- <include>$(DOLLAR)(%SCITECH)/include</include>
- </if>
<include>$(INC_TIFF_BUILD)</include>
<include>$(INC_TIFF)</include>
<include>$(INC_JPEG)</include>
projects / wxWidgets.git / blobdiff