Skip to content
This repository was archived by the owner on Oct 31, 2022. It is now read-only.

Commit 000afd7

Browse files
bangnoisebangnoise
committed
Update projects for Visual Studio 2013 and WiX 3.9
1 parent f0cb79a commit 000afd7

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

‎Hap Codec Windows/Hap Codec.vcxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -20,13 +20,13 @@
2020
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2121
<ConfigurationType>DynamicLibrary</ConfigurationType>
2222
<UseDebugLibraries>true</UseDebugLibraries>
23-
<PlatformToolset>v110</PlatformToolset>
23+
<PlatformToolset>v120</PlatformToolset>
2424
<CharacterSet>Unicode</CharacterSet>
2525
</PropertyGroup>
2626
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2727
<ConfigurationType>DynamicLibrary</ConfigurationType>
2828
<UseDebugLibraries>false</UseDebugLibraries>
29-
<PlatformToolset>v110</PlatformToolset>
29+
<PlatformToolset>v120</PlatformToolset>
3030
<WholeProgramOptimization>true</WholeProgramOptimization>
3131
<CharacterSet>Unicode</CharacterSet>
3232
</PropertyGroup>

‎Hap Codec Windows/Installer/HapQuickTimeSetup.wxs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
</UI>
2626
<Condition Message="The Hap QuickTime component is only supported on Windows Vista, Windows Server 2008, or higher."><![CDATA[Installed OR (VersionNT >= 600)]]></Condition>
2727
<DirectoryRef Id="TARGETDIR">
28-
<Merge Id="VCRedist" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC110_CRT_x86.msm" DiskId="1" Language="0" />
28+
<Merge Id="VCRedist" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC120_CRT_x86.msm" DiskId="1" Language="0" />
2929
</DirectoryRef>
30-
<Feature Id="VCRedist" Title="Visual C++ 11.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
30+
<Feature Id="VCRedist" Title="Visual C++ 12.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
3131
<MergeRef Id="VCRedist" />
3232
</Feature>
3333
<MajorUpgrade

‎Hap Codec Windows/Installer/build.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
MSBuild "..\Hap Codec.sln" /p:Configuration=RELEASE
2-
"C:\Program Files (x86)\WiX Toolset v3.8\bin\candle.exe" HapQuickTimeSetup.wxs
3-
"C:\Program Files (x86)\WiX Toolset v3.8\bin\light.exe" -ext WixUIExtension HapQuickTimeSetup.wixobj
2+
"C:\Program Files (x86)\WiX Toolset v3.9\bin\candle.exe" HapQuickTimeSetup.wxs
3+
"C:\Program Files (x86)\WiX Toolset v3.9\bin\light.exe" -ext WixUIExtension HapQuickTimeSetup.wixobj

‎external/snappy/snappy-windows/snappy.vcxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -19,13 +19,13 @@
1919
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2020
<ConfigurationType>StaticLibrary</ConfigurationType>
2121
<UseDebugLibraries>true</UseDebugLibraries>
22-
<PlatformToolset>v110</PlatformToolset>
22+
<PlatformToolset>v120</PlatformToolset>
2323
<CharacterSet>Unicode</CharacterSet>
2424
</PropertyGroup>
2525
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2626
<ConfigurationType>StaticLibrary</ConfigurationType>
2727
<UseDebugLibraries>false</UseDebugLibraries>
28-
<PlatformToolset>v110</PlatformToolset>
28+
<PlatformToolset>v120</PlatformToolset>
2929
<WholeProgramOptimization>true</WholeProgramOptimization>
3030
<CharacterSet>Unicode</CharacterSet>
3131
</PropertyGroup>

‎external/squish/squish-windows/squish.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -25,24 +25,24 @@
2525
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2626
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2727
<ConfigurationType>StaticLibrary</ConfigurationType>
28-
<PlatformToolset>v110</PlatformToolset>
28+
<PlatformToolset>v120</PlatformToolset>
2929
<CharacterSet>Unicode</CharacterSet>
3030
<WholeProgramOptimization>true</WholeProgramOptimization>
3131
</PropertyGroup>
3232
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3333
<ConfigurationType>StaticLibrary</ConfigurationType>
34-
<PlatformToolset>v110</PlatformToolset>
34+
<PlatformToolset>v120</PlatformToolset>
3535
<CharacterSet>Unicode</CharacterSet>
3636
</PropertyGroup>
3737
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3838
<ConfigurationType>StaticLibrary</ConfigurationType>
39-
<PlatformToolset>v110</PlatformToolset>
39+
<PlatformToolset>v120</PlatformToolset>
4040
<CharacterSet>MultiByte</CharacterSet>
4141
<WholeProgramOptimization>true</WholeProgramOptimization>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4444
<ConfigurationType>StaticLibrary</ConfigurationType>
45-
<PlatformToolset>v110</PlatformToolset>
45+
<PlatformToolset>v120</PlatformToolset>
4646
<CharacterSet>MultiByte</CharacterSet>
4747
</PropertyGroup>
4848
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

0 commit comments

Comments
 (0)