GNOME.org
 

[pangomm] MSVC Builds: Support only Visual Studio 2013 (and later)

commit c6e5a978d7d8f0346ff667fbc21c2dc497094f3f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Sep 10 14:30:53 2015 +0800

    MSVC Builds: Support only Visual Studio 2013 (and later)
    
    The current pangomm code base now requires C++-11 support, which is only
    supported well enough by Visual Studio 2013 and later, so:
    
    -Update the Visaul Studio 2010 projects to be in 2013 format, and rename
     things as needed.
    -Remove the Visual Studio 2005/2008 projects
    -Update the README.win32 file to reflect on these changes.

 MSVC_Net2005/blank.cpp                             |   11 -
 MSVC_Net2005/filelist.am                           |   10 -
 MSVC_Net2005/gendef/gendef.cc                      |   94 -------
 MSVC_Net2005/gendef/gendef.vcproj                  |  175 -------------
 MSVC_Net2005/pangomm.sln                           |   38 ---
 MSVC_Net2005/pangomm/pangomm.rc.in                 |   71 ------
 MSVC_Net2005/pangomm/pangomm.vcproj                |  261 --------------------
 MSVC_Net2008/blank.cpp                             |   11 -
 MSVC_Net2008/filelist.am                           |   14 -
 MSVC_Net2008/gendef.vcproj                         |  175 -------------
 MSVC_Net2008/gendef/gendef.cc                      |   94 -------
 MSVC_Net2008/install.vcproj                        |   77 ------
 MSVC_Net2008/pangomm-build-defines.vsprops         |   32 ---
 MSVC_Net2008/pangomm-install.vsprops               |   80 ------
 MSVC_Net2008/pangomm-version-paths.vsprops         |   39 ---
 MSVC_Net2008/pangomm.sln                           |   51 ----
 MSVC_Net2008/pangomm.vcproj                        |  253 -------------------
 MSVC_Net2008/pangomm/pangomm.rc.in                 |   71 ------
 {MSVC_Net2010 => MSVC_Net2013}/filelist.am         |    2 +-
 {MSVC_Net2010 => MSVC_Net2013}/gendef.vcxproj      |    8 +-
 .../gendef.vcxproj.filters                         |    0
 {MSVC_Net2010 => MSVC_Net2013}/gendef/gendef.cc    |    0
 {MSVC_Net2010 => MSVC_Net2013}/install.vcxproj     |    8 +-
 .../pangomm-build-defines.props                    |    0
 .../pangomm-install.props                          |    0
 .../pangomm-version-paths.props                    |    2 +-
 {MSVC_Net2010 => MSVC_Net2013}/pangomm.sln         |    4 +-
 {MSVC_Net2010 => MSVC_Net2013}/pangomm.vcxproj     |    8 +-
 .../pangomm.vcxproj.filters                        |    0
 .../pangomm/pangomm.rc.in                          |    0
 Makefile.am                                        |   10 +-
 README.win32                                       |   23 +-
 configure.ac                                       |   12 +-
 33 files changed, 31 insertions(+), 1603 deletions(-)
---
diff --git a/MSVC_Net2010/filelist.am b/MSVC_Net2013/filelist.am
similarity index 93%
rename from MSVC_Net2010/filelist.am
rename to MSVC_Net2013/filelist.am
index 4ee99f2..35233bc 100644
--- a/MSVC_Net2010/filelist.am
+++ b/MSVC_Net2013/filelist.am
@@ -1,6 +1,6 @@
 ## This file is part of pangomm.
 
-msvc_net2010_data =                            \
+msvc_net2013_data =                            \
        pangomm.sln                             \
        pangomm-build-defines.props             \
        pangomm-version-paths.props             \
diff --git a/MSVC_Net2010/gendef.vcxproj b/MSVC_Net2013/gendef.vcxproj
similarity index 97%
rename from MSVC_Net2010/gendef.vcxproj
rename to MSVC_Net2013/gendef.vcxproj
index 60edf9d..ceca956 100644
--- a/MSVC_Net2010/gendef.vcxproj
+++ b/MSVC_Net2013/gendef.vcxproj
@@ -26,22 +26,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2010/gendef.vcxproj.filters b/MSVC_Net2013/gendef.vcxproj.filters
similarity index 100%
rename from MSVC_Net2010/gendef.vcxproj.filters
rename to MSVC_Net2013/gendef.vcxproj.filters
diff --git a/MSVC_Net2010/gendef/gendef.cc b/MSVC_Net2013/gendef/gendef.cc
similarity index 100%
rename from MSVC_Net2010/gendef/gendef.cc
rename to MSVC_Net2013/gendef/gendef.cc
diff --git a/MSVC_Net2010/install.vcxproj b/MSVC_Net2013/install.vcxproj
similarity index 97%
rename from MSVC_Net2010/install.vcxproj
rename to MSVC_Net2013/install.vcxproj
index 5f192c9..fecde32 100644
--- a/MSVC_Net2010/install.vcxproj
+++ b/MSVC_Net2013/install.vcxproj
@@ -28,23 +28,23 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2010/pangomm-build-defines.props b/MSVC_Net2013/pangomm-build-defines.props
similarity index 100%
rename from MSVC_Net2010/pangomm-build-defines.props
rename to MSVC_Net2013/pangomm-build-defines.props
diff --git a/MSVC_Net2010/pangomm-install.props b/MSVC_Net2013/pangomm-install.props
similarity index 100%
rename from MSVC_Net2010/pangomm-install.props
rename to MSVC_Net2013/pangomm-install.props
diff --git a/MSVC_Net2010/pangomm-version-paths.props b/MSVC_Net2013/pangomm-version-paths.props
similarity index 98%
rename from MSVC_Net2010/pangomm-version-paths.props
rename to MSVC_Net2013/pangomm-version-paths.props
index 4fcd005..b287629 100644
--- a/MSVC_Net2010/pangomm-version-paths.props
+++ b/MSVC_Net2013/pangomm-version-paths.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <PropertyGroup Label="UserMacros">
-    <VSVer>10</VSVer>
+    <VSVer>12</VSVer>
     <GlibEtcInstallRoot>$(SolutionDir)\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
     <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)\</DefDir>
diff --git a/MSVC_Net2010/pangomm.sln b/MSVC_Net2013/pangomm.sln
similarity index 95%
rename from MSVC_Net2010/pangomm.sln
rename to MSVC_Net2013/pangomm.sln
index 5ba84cc..c8fad19 100644
--- a/MSVC_Net2010/pangomm.sln
+++ b/MSVC_Net2013/pangomm.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gendef", "gendef.vcxproj", 
"{07324745-C9BE-4D65-B08A-9C88188C0C28}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pangomm", "pangomm.vcxproj", 
"{A93D607A-5C37-4AEC-BA08-6A655F6DC834}"
diff --git a/MSVC_Net2010/pangomm.vcxproj b/MSVC_Net2013/pangomm.vcxproj
similarity index 98%
rename from MSVC_Net2010/pangomm.vcxproj
rename to MSVC_Net2013/pangomm.vcxproj
index 0bfa36b..aa03fad 100644
--- a/MSVC_Net2010/pangomm.vcxproj
+++ b/MSVC_Net2013/pangomm.vcxproj
@@ -28,22 +28,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2010/pangomm.vcxproj.filters b/MSVC_Net2013/pangomm.vcxproj.filters
similarity index 100%
rename from MSVC_Net2010/pangomm.vcxproj.filters
rename to MSVC_Net2013/pangomm.vcxproj.filters
diff --git a/MSVC_Net2010/pangomm/pangomm.rc.in b/MSVC_Net2013/pangomm/pangomm.rc.in
similarity index 100%
rename from MSVC_Net2010/pangomm/pangomm.rc.in
rename to MSVC_Net2013/pangomm/pangomm.rc.in
diff --git a/Makefile.am b/Makefile.am
index 559f7b4..05ac135 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,19 +38,15 @@ nodist_pangomm_libinclude_HEADERS = pango/pangommconfig.h
 pkgconfigdir = $(libdir)/pkgconfig
 nodist_pkgconfig_DATA = pango/$(PANGOMM_MODULE_NAME).pc
 
-include $(srcdir)/MSVC_Net2005/filelist.am
-include $(srcdir)/MSVC_Net2008/filelist.am
-include $(srcdir)/MSVC_Net2010/filelist.am
+include $(srcdir)/MSVC_Net2013/filelist.am
 
 text_files = COPYING.tools README.SUN README.win32
-msvc_files = $(addprefix MSVC_Net2005/,$(msvc_net2005_data)) \
-             $(addprefix MSVC_Net2008/,$(msvc_net2008_data)) \
-             $(addprefix MSVC_Net2010/,$(msvc_net2010_data))
+msvc_files = $(addprefix MSVC_Net2013/,$(msvc_net2013_data))
 
 dist_noinst_DATA = $(text_files) $(msvc_files)
 dist_noinst_SCRIPTS = autogen.sh
 
-DISTCLEANFILES = MSVC_Net2005/pangomm/pangommconfig.h MSVC_Net2008/pangomm/pangommconfig.h 
MSVC_Net2010/pangomm/pangommconfig.h
+DISTCLEANFILES = MSVC_Net2013/pangomm/pangommconfig.h
 
 # Optional: auto-generate the ChangeLog file from the git log on make dist
 include $(top_srcdir)/build/dist-changelog.am
diff --git a/README.win32 b/README.win32
index 46b6665..9470ab5 100644
--- a/README.win32
+++ b/README.win32
@@ -2,7 +2,7 @@ Building gtkmm on Win32
 ===========================
 
 Currently, both the mingw (native win32) gcc compiler and MS Visual
-Studio 2005 are supported. gtkmm can be built with mingw32-gcc using
+Studio 2013 are supported. gtkmm can be built with mingw32-gcc using
 the gnu autotools (automake, autoconf, libtool). As explicitly
 stated in the gtk+ for win32 distribution (http://www.gimp.org/win32/),
 the gcc compiler provided by the cygwin distribution should not be
@@ -44,20 +44,15 @@ make
 make check
 make install
 
-2. MS Visual Studio 2005
+2. MS Visual Studio 2013
 
-Open the gtkmm.sln solution file in the MSVC_Net2003 directory. In
-the Tools/Options panel, add the appropriate GTK+, glibmm include and lib
-directories to the Projects and Solutions/VC++ directories. Build the
-solution. 
-
-Important NOTE : to circumvent the C++ compiler bug described in this
-bugzilla entry (http://bugzilla.gnome.org/show_bug.cgi?id=158040), it
-is necessary to add '/vd2' to the list of compiler options when
-building and/or using gtkmm with Visual Studio 2005. 
-
-gtkmm-2.8 will probably not work correctly with Visual Studio 7.1 or
-below because of the aforementioned bug.
+Open the pangomm.sln solution file in the MSVC_Net2013 directory. In
+the Tools/Options panel, add the appropriate GTK+ and glibmm include
+and lib directories to the Projects and Solutions/VC++ directories,
+if they are not in the locations specified by the property sheets,
+i.e. $(srcroot)\..\vs12\$(Platform). Build the solution.  The option
+/vd2 should not be used in these builds, unlike previous builds, as
+that would cause broken binaries to be built, causing crashes.
 
 3. Gtkmm methods and signals not available on win32
 
diff --git a/configure.ac b/configure.ac
index fa2554b..7d0af3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,15 +74,9 @@ AC_CONFIG_FILES([Makefile
                  pango/pangomm/Makefile
                  docs/Makefile
                  docs/reference/Doxyfile
-                 MSVC_Net2005/pangomm/pangomm.rc
-                 MSVC_Net2008/pangomm/pangomm.rc
-                 MSVC_Net2010/pangomm/pangomm.rc])
+                 MSVC_Net2013/pangomm/pangomm.rc])
 
 # Copy the generated configuration headers into the MSVC project directories.
-AC_CONFIG_COMMANDS([MSVC_Net2005/pangomm/pangommconfig.h],
-                   [cp -f pango/pangommconfig.h MSVC_Net2005/pangomm/pangommconfig.h])
-AC_CONFIG_COMMANDS([MSVC_Net2008/pangomm/pangommconfig.h],
-                   [cp -f pango/pangommconfig.h MSVC_Net2008/pangomm/pangommconfig.h])
-AC_CONFIG_COMMANDS([MSVC_Net2010/pangomm/pangommconfig.h],
-                   [cp -f pango/pangommconfig.h MSVC_Net2010/pangomm/pangommconfig.h])
+AC_CONFIG_COMMANDS([MSVC_Net2013/pangomm/pangommconfig.h],
+                   [cp -f pango/pangommconfig.h MSVC_Net2013/pangomm/pangommconfig.h])
 AC_OUTPUT
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]