diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2012-11-20 12:35:04 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2012-11-20 12:35:04 +0800 |
| commit | 8ce5a4284b7298c891ecc3b50409a4b479daf588 (patch) | |
| tree | 77a203f08b23d279dbd582eb8873bc72b354a265 | |
| parent | ff9d69d5328abd846b2c66e3ed5ad0e90de8f5d8 (diff) | |
| download | gdk-pixbuf-8ce5a4284b7298c891ecc3b50409a4b479daf588.tar.gz | |
Visual C++ projects: Updates
-Prepare support for Visual Studio 2012, by adding the PlatformToolset tag
to all configs so that we can provide support for VS2012 with minimal
effort by simply copying and replacing the VS2010 items with the VS2012
counterparts with scripts.
-Improve consistency by using MultiByte character sets for all project
configs
| -rw-r--r-- | build/win32/vs10/gdk-pixbuf-csource.vcxproj | 4 | ||||
| -rw-r--r-- | build/win32/vs10/gdk-pixbuf-pixdata.vcxproj | 8 | ||||
| -rw-r--r-- | build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj | 8 | ||||
| -rw-r--r-- | build/win32/vs10/gdk-pixbuf.vcxprojin | 8 | ||||
| -rw-r--r-- | build/win32/vs9/gdk-pixbuf-pixdata.vcproj | 4 | ||||
| -rw-r--r-- | build/win32/vs9/gdk-pixbuf-query-loaders.vcproj | 4 |
6 files changed, 28 insertions, 8 deletions
diff --git a/build/win32/vs10/gdk-pixbuf-csource.vcxproj b/build/win32/vs10/gdk-pixbuf-csource.vcxproj index bc43b6ba7..2171aa554 100644 --- a/build/win32/vs10/gdk-pixbuf-csource.vcxproj +++ b/build/win32/vs10/gdk-pixbuf-csource.vcxproj @@ -27,19 +27,23 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/build/win32/vs10/gdk-pixbuf-pixdata.vcxproj b/build/win32/vs10/gdk-pixbuf-pixdata.vcxproj index 16440a674..8cc91b332 100644 --- a/build/win32/vs10/gdk-pixbuf-pixdata.vcxproj +++ b/build/win32/vs10/gdk-pixbuf-pixdata.vcxproj @@ -26,21 +26,25 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj b/build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj index 85550dc1f..96481846b 100644 --- a/build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj +++ b/build/win32/vs10/gdk-pixbuf-query-loaders.vcxproj @@ -26,21 +26,25 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/build/win32/vs10/gdk-pixbuf.vcxprojin b/build/win32/vs10/gdk-pixbuf.vcxprojin index 87d69393d..459a7e04b 100644 --- a/build/win32/vs10/gdk-pixbuf.vcxprojin +++ b/build/win32/vs10/gdk-pixbuf.vcxprojin @@ -43,34 +43,42 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v100</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/build/win32/vs9/gdk-pixbuf-pixdata.vcproj b/build/win32/vs9/gdk-pixbuf-pixdata.vcproj index 0bd1b44c5..35810cfe7 100644 --- a/build/win32/vs9/gdk-pixbuf-pixdata.vcproj +++ b/build/win32/vs9/gdk-pixbuf-pixdata.vcproj @@ -23,7 +23,7 @@ Name="Debug|Win32"
InheritedPropertySheets=".\gdk-pixbuf.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -84,7 +84,7 @@ Name="Release|Win32"
InheritedPropertySheets=".\gdk-pixbuf.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
diff --git a/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj b/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj index 529601123..65447013a 100644 --- a/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj +++ b/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj @@ -23,7 +23,7 @@ Name="Debug|Win32" ConfigurationType="1" InheritedPropertySheets=".\gdk-pixbuf.vsprops" - CharacterSet="1" + CharacterSet="2" > <Tool Name="VCPreBuildEventTool" @@ -86,7 +86,7 @@ Name="Release|Win32" ConfigurationType="1" InheritedPropertySheets=".\gdk-pixbuf.vsprops" - CharacterSet="1" + CharacterSet="2" WholeProgramOptimization="1" > <Tool |