[glibmm] Bug 736720: Fix ustring for Visual Studio Builds
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Bug 736720: Fix ustring for Visual Studio Builds
- Date: Tue, 16 Sep 2014 08:11:20 +0000 (UTC)
commit 05b8d437add256416ee304994759d1a53bda1d97
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Sep 16 16:11:12 2014 +0800
Bug 736720: Fix ustring for Visual Studio Builds
Update the property sheets so that SIZEOF_WCHAR_T is defined as 2 when
the glibmm library is built. This ensures that the correct code path in
the ustring class is taken for Visual Studio builds, which avoids an
unhandled GLib::ConvertError exception.
* MSVC_Net2005/glibmm-build-defines.vsprops:
* MSVC_Net2008/glibmm-build-defines.vsprops:
* MSVC_Net2010/glibmm-build-defines.props: Define SIZEOF_WCHAR_T
when building glibmm so that ustring will use the correct code
path on Visual Studio builds.
MSVC_Net2005/glibmm-build-defines.vsprops | 2 +-
MSVC_Net2008/glibmm-build-defines.vsprops | 2 +-
MSVC_Net2010/glibmm-build-defines.props | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/MSVC_Net2005/glibmm-build-defines.vsprops b/MSVC_Net2005/glibmm-build-defines.vsprops
index ab10bc2..5773a01 100644
--- a/MSVC_Net2005/glibmm-build-defines.vsprops
+++ b/MSVC_Net2005/glibmm-build-defines.vsprops
@@ -27,7 +27,7 @@
/>
<UserMacro
Name="GLibMMBuildDefs"
- Value="GLIBMM_BUILD"
+ Value="SIZEOF_WCHAR_T=2;GLIBMM_BUILD"
/>
<UserMacro
Name="GioMMBuildDefs"
diff --git a/MSVC_Net2008/glibmm-build-defines.vsprops b/MSVC_Net2008/glibmm-build-defines.vsprops
index ab10bc2..5773a01 100644
--- a/MSVC_Net2008/glibmm-build-defines.vsprops
+++ b/MSVC_Net2008/glibmm-build-defines.vsprops
@@ -27,7 +27,7 @@
/>
<UserMacro
Name="GLibMMBuildDefs"
- Value="GLIBMM_BUILD"
+ Value="SIZEOF_WCHAR_T=2;GLIBMM_BUILD"
/>
<UserMacro
Name="GioMMBuildDefs"
diff --git a/MSVC_Net2010/glibmm-build-defines.props b/MSVC_Net2010/glibmm-build-defines.props
index df94aae..6fb4fb5 100644
--- a/MSVC_Net2010/glibmm-build-defines.props
+++ b/MSVC_Net2010/glibmm-build-defines.props
@@ -4,7 +4,7 @@
<Import Project="glibmm-version-paths.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
- <GLibMMBuildDefs>GLIBMM_BUILD</GLibMMBuildDefs>
+ <GLibMMBuildDefs>SIZEOF_WCHAR_T=2;GLIBMM_BUILD</GLibMMBuildDefs>
<GioMMBuildDefs>GIOMM_BUILD</GioMMBuildDefs>
<CPPDepLibsRelease>sigc-vc$(VSVer)0-2_0.lib</CPPDepLibsRelease>
<CPPDepLibsDebug>sigc-vc$(VSVer)0-d-2_0.lib</CPPDepLibsDebug>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]