GNOME.org
 

[atkmm] MSVC Builds: Support Visual Studio 2013 (and later) Only

commit 9e572e74d7a60cbc84d0cc3826a9a62e4e60a26c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Sep 10 17:06:07 2015 +0800

    MSVC Builds: Support Visual Studio 2013 (and later) Only
    
    atkmm now requires a C++-11-capable compiler in order to build it, which is
    equivilant to Visual Studio 2013 and later, so we:
    
    -Drop the Visual Studio 2005 and 2008 projects
    -Move the 2010 projects to become 2013 projects, as their formats are
     largely the same.

 MSVC_Net2005/atkmm.sln                             |   38 ---
 MSVC_Net2005/atkmm/atkmm.vcproj                    |  243 --------------------
 MSVC_Net2005/blank.cpp                             |   11 -
 MSVC_Net2005/filelist.am                           |   10 -
 MSVC_Net2005/gendef/gendef.vcproj                  |  183 ---------------
 MSVC_Net2008/atkmm-build-defines.vsprops           |   32 ---
 MSVC_Net2008/atkmm-install.vsprops                 |   67 ------
 MSVC_Net2008/atkmm-version-paths.vsprops           |   39 ---
 MSVC_Net2008/atkmm.sln                             |   51 ----
 MSVC_Net2008/atkmm.vcproj                          |  231 -------------------
 MSVC_Net2008/atkmm/atkmm.rc.in                     |   71 ------
 MSVC_Net2008/blank.cpp                             |   11 -
 MSVC_Net2008/filelist.am                           |   14 --
 MSVC_Net2008/gendef.vcproj                         |  165 -------------
 MSVC_Net2008/gendef/gendef.cc                      |   94 --------
 MSVC_Net2008/install.vcproj                        |   77 ------
 MSVC_Net2010/atkmm/atkmm.rc.in                     |   71 ------
 MSVC_Net2010/gendef/gendef.cc                      |   94 --------
 .../atkmm-build-defines.props                      |    0
 {MSVC_Net2010 => MSVC_Net2013}/atkmm-install.props |    0
 .../atkmm-version-paths.props                      |    2 +-
 {MSVC_Net2010 => MSVC_Net2013}/atkmm.sln           |    0
 {MSVC_Net2010 => MSVC_Net2013}/atkmm.vcxproj       |    8 +-
 .../atkmm.vcxproj.filters                          |    0
 {MSVC_Net2005 => MSVC_Net2013}/atkmm/atkmm.rc.in   |    0
 {MSVC_Net2010 => MSVC_Net2013}/filelist.am         |    2 +-
 {MSVC_Net2010 => MSVC_Net2013}/gendef.vcxproj      |    8 +-
 .../gendef.vcxproj.filters                         |    0
 {MSVC_Net2005 => MSVC_Net2013}/gendef/gendef.cc    |    0
 {MSVC_Net2010 => MSVC_Net2013}/install.vcxproj     |    8 +-
 Makefile.am                                        |    8 +-
 configure.ac                                       |   12 +-
 32 files changed, 19 insertions(+), 1531 deletions(-)
---
diff --git a/MSVC_Net2010/atkmm-build-defines.props b/MSVC_Net2013/atkmm-build-defines.props
similarity index 100%
rename from MSVC_Net2010/atkmm-build-defines.props
rename to MSVC_Net2013/atkmm-build-defines.props
diff --git a/MSVC_Net2010/atkmm-install.props b/MSVC_Net2013/atkmm-install.props
similarity index 100%
rename from MSVC_Net2010/atkmm-install.props
rename to MSVC_Net2013/atkmm-install.props
diff --git a/MSVC_Net2010/atkmm-version-paths.props b/MSVC_Net2013/atkmm-version-paths.props
similarity index 98%
rename from MSVC_Net2010/atkmm-version-paths.props
rename to MSVC_Net2013/atkmm-version-paths.props
index 8c487fa..affd50f 100644
--- a/MSVC_Net2010/atkmm-version-paths.props
+++ b/MSVC_Net2013/atkmm-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/atkmm.sln b/MSVC_Net2013/atkmm.sln
similarity index 100%
rename from MSVC_Net2010/atkmm.sln
rename to MSVC_Net2013/atkmm.sln
diff --git a/MSVC_Net2010/atkmm.vcxproj b/MSVC_Net2013/atkmm.vcxproj
similarity index 98%
rename from MSVC_Net2010/atkmm.vcxproj
rename to MSVC_Net2013/atkmm.vcxproj
index 1d418f7..9d37060 100644
--- a/MSVC_Net2010/atkmm.vcxproj
+++ b/MSVC_Net2013/atkmm.vcxproj
@@ -27,22 +27,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/atkmm.vcxproj.filters b/MSVC_Net2013/atkmm.vcxproj.filters
similarity index 100%
rename from MSVC_Net2010/atkmm.vcxproj.filters
rename to MSVC_Net2013/atkmm.vcxproj.filters
diff --git a/MSVC_Net2005/atkmm/atkmm.rc.in b/MSVC_Net2013/atkmm/atkmm.rc.in
old mode 100755
new mode 100644
similarity index 100%
rename from MSVC_Net2005/atkmm/atkmm.rc.in
rename to MSVC_Net2013/atkmm/atkmm.rc.in
diff --git a/MSVC_Net2010/filelist.am b/MSVC_Net2013/filelist.am
similarity index 92%
rename from MSVC_Net2010/filelist.am
rename to MSVC_Net2013/filelist.am
index 132557b..96970fd 100644
--- a/MSVC_Net2010/filelist.am
+++ b/MSVC_Net2013/filelist.am
@@ -1,6 +1,6 @@
 ## This file is part of atkmm.
 
-msvc_net2010_data =                    \
+msvc_net2013_data =                    \
        atkmm.sln                       \
        atkmm-build-defines.props       \
        atkmm-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 561499b..554054c 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_Net2005/gendef/gendef.cc b/MSVC_Net2013/gendef/gendef.cc
old mode 100755
new mode 100644
similarity index 100%
rename from MSVC_Net2005/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 5a5d9d0..6225a66 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/Makefile.am b/Makefile.am
index d7f6275..1952465 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,14 +39,10 @@ nodist_atkmm_libinclude_HEADERS = atk/atkmmconfig.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = atk/$(ATKMM_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
-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
diff --git a/configure.ac b/configure.ac
index 4d4644c..c15732f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,15 +77,9 @@ AC_CONFIG_FILES([Makefile
                  atk/atkmm/Makefile
                  doc/Makefile
                  doc/reference/Doxyfile
-                 MSVC_Net2005/atkmm/atkmm.rc
-                 MSVC_Net2008/atkmm/atkmm.rc
-                 MSVC_Net2010/atkmm/atkmm.rc])
+                 MSVC_Net2013/atkmm/atkmm.rc])
 
 # Copy the generated configuration headers into the MSVC project directories.
-AC_CONFIG_COMMANDS([MSVC_Net2005/atkmm/atkmmconfig.h],
-                   [cp -f atk/atkmmconfig.h MSVC_Net2005/atkmm/atkmmconfig.h])
-AC_CONFIG_COMMANDS([MSVC_Net2008/atkmm/atkmmconfig.h],
-                   [cp -f atk/atkmmconfig.h MSVC_Net2008/atkmm/atkmmconfig.h])
-AC_CONFIG_COMMANDS([MSVC_Net2010/atkmm/atkmmconfig.h],
-                   [cp -f atk/atkmmconfig.h MSVC_Net2010/atkmm/atkmmconfig.h])
+AC_CONFIG_COMMANDS([MSVC_Net2013/atkmm/atkmmconfig.h],
+                   [cp -f atk/atkmmconfig.h MSVC_Net2013/atkmm/atkmmconfig.h])
 AC_OUTPUT
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]