Skip to content

Commit 516652e

Browse files
sdottakasdottaka
committed
Retry to upgrade project files to VS2015
--HG-- branch : 3way-diff
1 parent 8d80de8 commit 516652e

File tree

6 files changed

+31
-23
lines changed

6 files changed

+31
-23
lines changed

‎BuildBin.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ del /s Build\*.exe
44
del /s BuildTmp\*.res
55

66
setlocal
7-
call "%VS120COMNTOOLS%vsvars32.bat"
7+
call "%VS140COMNTOOLS%vsvars32.bat"
88
MSBuild FRHED_vc10.sln /t:build /p:Configuration=UnicodeRelease /p:Platform="Win32" || pause
99
MSBuild FRHED_vc10.sln /t:build /p:Configuration=UnicodeRelease /p:Platform="x64" || pause
1010

‎FRHED/H2O.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ typedef struct _IMAGELIST { int unused; } IMAGELIST__;
4747

4848
#ifdef _DEBUG
4949
#define ASSERT_MSG(cond, msg) \
50-
(cond) ? (void)0 : _RPT_BASE((_CRT_ASSERT, __FILE__, __LINE__, NULL, msg))
50+
(cond) ? (void)0 : _RPT_BASE(_CRT_ASSERT, __FILE__, __LINE__, NULL, msg)
5151
#else
5252
#define ASSERT_MSG(cond, msg)
5353
#endif

‎FRHED/frhed.vcxproj

+13-9
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="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -43,44 +43,44 @@
4343
<ConfigurationType>Application</ConfigurationType>
4444
<UseOfMfc>false</UseOfMfc>
4545
<CharacterSet>NotSet</CharacterSet>
46-
<PlatformToolset>v120_xp</PlatformToolset>
46+
<PlatformToolset>v140_xp</PlatformToolset>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="Configuration">
4949
<ConfigurationType>Application</ConfigurationType>
5050
<UseOfMfc>false</UseOfMfc>
5151
<CharacterSet>NotSet</CharacterSet>
52-
<PlatformToolset>v120</PlatformToolset>
52+
<PlatformToolset>v140</PlatformToolset>
5353
</PropertyGroup>
5454
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5555
<ConfigurationType>Application</ConfigurationType>
5656
<UseOfMfc>false</UseOfMfc>
57-
<PlatformToolset>v120</PlatformToolset>
57+
<PlatformToolset>v140</PlatformToolset>
5858
</PropertyGroup>
5959
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6060
<ConfigurationType>Application</ConfigurationType>
6161
<UseOfMfc>false</UseOfMfc>
62-
<PlatformToolset>v120_xp</PlatformToolset>
62+
<PlatformToolset>v140_xp</PlatformToolset>
6363
</PropertyGroup>
6464
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="Configuration">
6565
<ConfigurationType>Application</ConfigurationType>
6666
<UseOfMfc>false</UseOfMfc>
67-
<PlatformToolset>v120_xp</PlatformToolset>
67+
<PlatformToolset>v140_xp</PlatformToolset>
6868
</PropertyGroup>
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="Configuration">
7070
<ConfigurationType>Application</ConfigurationType>
7171
<UseOfMfc>false</UseOfMfc>
7272
<CharacterSet>NotSet</CharacterSet>
73-
<PlatformToolset>v120</PlatformToolset>
73+
<PlatformToolset>v140</PlatformToolset>
7474
</PropertyGroup>
7575
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
7676
<ConfigurationType>Application</ConfigurationType>
7777
<UseOfMfc>false</UseOfMfc>
78-
<PlatformToolset>v120</PlatformToolset>
78+
<PlatformToolset>v140</PlatformToolset>
7979
</PropertyGroup>
8080
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
8181
<ConfigurationType>Application</ConfigurationType>
8282
<UseOfMfc>false</UseOfMfc>
83-
<PlatformToolset>v120_xp</PlatformToolset>
83+
<PlatformToolset>v140_xp</PlatformToolset>
8484
</PropertyGroup>
8585
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
8686
<ImportGroup Label="ExtensionSettings">
@@ -229,6 +229,7 @@
229229
<DataExecutionPrevention>
230230
</DataExecutionPrevention>
231231
<TargetMachine>MachineX86</TargetMachine>
232+
<MinimumRequiredVersion>5.01</MinimumRequiredVersion>
232233
</Link>
233234
<PostBuildEvent>
234235
<Command>editbin.exe /OSVERSION:4.0 /SUBSYSTEM:WINDOWS,4.0 "$(TargetPath)"</Command>
@@ -259,6 +260,7 @@
259260
<DataExecutionPrevention>
260261
</DataExecutionPrevention>
261262
<TargetMachine>MachineX64</TargetMachine>
263+
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
262264
</Link>
263265
</ItemDefinitionGroup>
264266
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">
@@ -287,6 +289,7 @@
287289
<DataExecutionPrevention>
288290
</DataExecutionPrevention>
289291
<TargetMachine>MachineX86</TargetMachine>
292+
<MinimumRequiredVersion>5.01</MinimumRequiredVersion>
290293
</Link>
291294
<PostBuildEvent>
292295
<Command>editbin.exe /OSVERSION:4.0 /SUBSYSTEM:WINDOWS,4.0 "$(TargetPath)"</Command>
@@ -317,6 +320,7 @@
317320
<DataExecutionPrevention>
318321
</DataExecutionPrevention>
319322
<TargetMachine>MachineX64</TargetMachine>
323+
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
320324
</Link>
321325
</ItemDefinitionGroup>
322326
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">

‎FRHED/heksedit.vcxproj

+13-9
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="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -43,45 +43,45 @@
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseOfMfc>false</UseOfMfc>
4545
<CharacterSet>Unicode</CharacterSet>
46-
<PlatformToolset>v120_xp</PlatformToolset>
46+
<PlatformToolset>v140_xp</PlatformToolset>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
5050
<UseOfMfc>false</UseOfMfc>
5151
<CharacterSet>Unicode</CharacterSet>
52-
<PlatformToolset>v120</PlatformToolset>
52+
<PlatformToolset>v140</PlatformToolset>
5353
</PropertyGroup>
5454
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5555
<ConfigurationType>DynamicLibrary</ConfigurationType>
5656
<UseOfMfc>false</UseOfMfc>
57-
<PlatformToolset>v120_xp</PlatformToolset>
57+
<PlatformToolset>v140_xp</PlatformToolset>
5858
</PropertyGroup>
5959
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
6060
<ConfigurationType>DynamicLibrary</ConfigurationType>
6161
<UseOfMfc>false</UseOfMfc>
62-
<PlatformToolset>v120</PlatformToolset>
62+
<PlatformToolset>v140</PlatformToolset>
6363
</PropertyGroup>
6464
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="Configuration">
6565
<ConfigurationType>DynamicLibrary</ConfigurationType>
6666
<UseOfMfc>false</UseOfMfc>
6767
<CharacterSet>Unicode</CharacterSet>
68-
<PlatformToolset>v120_xp</PlatformToolset>
68+
<PlatformToolset>v140_xp</PlatformToolset>
6969
</PropertyGroup>
7070
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="Configuration">
7171
<ConfigurationType>DynamicLibrary</ConfigurationType>
7272
<UseOfMfc>false</UseOfMfc>
7373
<CharacterSet>Unicode</CharacterSet>
74-
<PlatformToolset>v120</PlatformToolset>
74+
<PlatformToolset>v140</PlatformToolset>
7575
</PropertyGroup>
7676
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7777
<ConfigurationType>DynamicLibrary</ConfigurationType>
7878
<UseOfMfc>false</UseOfMfc>
79-
<PlatformToolset>v120_xp</PlatformToolset>
79+
<PlatformToolset>v140_xp</PlatformToolset>
8080
</PropertyGroup>
8181
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
8282
<ConfigurationType>DynamicLibrary</ConfigurationType>
8383
<UseOfMfc>false</UseOfMfc>
84-
<PlatformToolset>v120</PlatformToolset>
84+
<PlatformToolset>v140</PlatformToolset>
8585
</PropertyGroup>
8686
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
8787
<ImportGroup Label="ExtensionSettings">
@@ -186,6 +186,7 @@
186186
<GenerateDebugInformation>true</GenerateDebugInformation>
187187
<SubSystem>Windows</SubSystem>
188188
<TargetMachine>MachineX86</TargetMachine>
189+
<MinimumRequiredVersion>5.01</MinimumRequiredVersion>
189190
</Link>
190191
<PostBuildEvent>
191192
<Command>editbin.exe /OSVERSION:4.0 /SUBSYSTEM:WINDOWS,4.0 "$(TargetPath)"</Command>
@@ -217,6 +218,7 @@
217218
<GenerateDebugInformation>true</GenerateDebugInformation>
218219
<SubSystem>Windows</SubSystem>
219220
<TargetMachine>MachineX64</TargetMachine>
221+
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
220222
</Link>
221223
</ItemDefinitionGroup>
222224
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -309,6 +311,7 @@
309311
<GenerateDebugInformation>true</GenerateDebugInformation>
310312
<SubSystem>Windows</SubSystem>
311313
<TargetMachine>MachineX86</TargetMachine>
314+
<MinimumRequiredVersion>5.01</MinimumRequiredVersion>
312315
</Link>
313316
<PostBuildEvent>
314317
<Command>editbin.exe /OSVERSION:4.0 /SUBSYSTEM:WINDOWS,4.0 "$(TargetPath)"</Command>
@@ -341,6 +344,7 @@
341344
<GenerateDebugInformation>true</GenerateDebugInformation>
342345
<SubSystem>Windows</SubSystem>
343346
<TargetMachine>MachineX64</TargetMachine>
347+
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
344348
</Link>
345349
</ItemDefinitionGroup>
346350
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">

‎FRHED/hexwnd.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6286,7 +6286,7 @@ HGLOBAL HexEditorWindow::RTF_hexdump(int start, int end, SIZE_T *plen)
62866286
"}\n" // \colortbl
62876287

62886288
//This is new for RTF 1.7, but it should be ignored by older readers so who cares (older than M$ Word XP = Word 2002??)
6289-
"{\\*\\generator frhed v"_CRT_STRINGIZE(FRHED_VERSION_3)";}\n"
6289+
"{\\*\\generator frhed v" _CRT_STRINGIZE(FRHED_VERSION_3) ";}\n"
62906290

62916291
//Metadata here too?
62926292
"{\\info\n"

‎FRHED_vc10.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.31101.0
2+
# Visual Studio 2015
3+
VisualStudioVersion = 14.0.24720.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "frhed", "FRHED\frhed.vcxproj", "{139D8239-98B4-4B29-A199-B27CDB8B4708}"
66
EndProject

0 commit comments

Comments
 (0)