Skip to content

Commit ee986f7

Browse files
committed
version.vcxproj reworked [skip ci]
1 parent 9a171db commit ee986f7

File tree

2 files changed

+37
-12
lines changed

2 files changed

+37
-12
lines changed

msvc/ReHLDS.sln

+8-8
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,18 @@ Global
143143
{A428392F-52FB-489E-87D8-623528C7F4F9}.Release|Win32.Build.0 = Release|Win32
144144
{A428392F-52FB-489E-87D8-623528C7F4F9}.Test Fixes|Win32.ActiveCfg = Debug|Win32
145145
{A428392F-52FB-489E-87D8-623528C7F4F9}.Tests|Win32.ActiveCfg = Debug|Win32
146-
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Debug Play|Win32.ActiveCfg = Release|Win32
147-
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Debug Play|Win32.Build.0 = Release|Win32
148-
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Debug|Win32.ActiveCfg = Release|Win32
149-
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Debug|Win32.Build.0 = Release|Win32
146+
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Debug Play|Win32.ActiveCfg = Debug|Win32
147+
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Debug Play|Win32.Build.0 = Debug|Win32
148+
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Debug|Win32.ActiveCfg = Debug|Win32
149+
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Debug|Win32.Build.0 = Debug|Win32
150150
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Release Play|Win32.ActiveCfg = Release|Win32
151151
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Release Play|Win32.Build.0 = Release|Win32
152152
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Release|Win32.ActiveCfg = Release|Win32
153153
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Release|Win32.Build.0 = Release|Win32
154-
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Test Fixes|Win32.ActiveCfg = Release|Win32
155-
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Test Fixes|Win32.Build.0 = Release|Win32
156-
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Tests|Win32.ActiveCfg = Release|Win32
157-
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Tests|Win32.Build.0 = Release|Win32
154+
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Test Fixes|Win32.ActiveCfg = Debug|Win32
155+
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Test Fixes|Win32.Build.0 = Debug|Win32
156+
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Tests|Win32.ActiveCfg = Debug|Win32
157+
{6973DCA5-253C-4D84-B51E-187E035EAE06}.Tests|Win32.Build.0 = Debug|Win32
158158
EndGlobalSection
159159
GlobalSection(SolutionProperties) = preSolution
160160
HideSolutionNode = FALSE

rehlds/version/msvc/version.vcxproj

+29-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
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">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
48
<ProjectConfiguration Include="Release|Win32">
59
<Configuration>Release</Configuration>
610
<Platform>Win32</Platform>
@@ -15,9 +19,16 @@
1519
<Keyword>MakeFileProj</Keyword>
1620
<ProjectName>version</ProjectName>
1721
<RootNamespace>version</RootNamespace>
18-
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1922
</PropertyGroup>
2023
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
24+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
25+
<ConfigurationType>Makefile</ConfigurationType>
26+
<UseDebugLibraries>true</UseDebugLibraries>
27+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
28+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
29+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
30+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
31+
</PropertyGroup>
2132
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2233
<ConfigurationType>Makefile</ConfigurationType>
2334
<UseDebugLibraries>false</UseDebugLibraries>
@@ -31,18 +42,32 @@
3142
</ImportGroup>
3243
<ImportGroup Label="Shared">
3344
</ImportGroup>
45+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
46+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
47+
</ImportGroup>
3448
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
3549
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3650
</ImportGroup>
3751
<PropertyGroup Label="UserMacros" />
52+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
53+
<NMakeBuildCommandLine>ECHO Setup version from Git revision
54+
IF EXIST "$(ProjectDir)..\..\version\appversion.bat" (CALL "$(ProjectDir)..\..\version\appversion.bat" "$(ProjectDir)..\..\version\" "$(SolutionDir)..\")</NMakeBuildCommandLine>
55+
<NMakeOutput>
56+
</NMakeOutput>
57+
<NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
58+
<NMakeCleanCommandLine>echo ON
59+
del /s "$(ProjectDir)..\appversion.h" &gt;nul 2&gt;&amp;1</NMakeCleanCommandLine>
60+
<NMakeReBuildCommandLine>ECHO Setup version from Git revision
61+
IF EXIST "$(ProjectDir)..\..\version\appversion.bat" (CALL "$(ProjectDir)..\..\version\appversion.bat" "$(ProjectDir)..\..\version\" "$(SolutionDir)..\")</NMakeReBuildCommandLine>
62+
</PropertyGroup>
3863
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
3964
<NMakeBuildCommandLine>ECHO Setup version from Git revision
4065
IF EXIST "$(ProjectDir)..\..\version\appversion.bat" (CALL "$(ProjectDir)..\..\version\appversion.bat" "$(ProjectDir)..\..\version\" "$(SolutionDir)..\")</NMakeBuildCommandLine>
4166
<NMakeOutput>
4267
</NMakeOutput>
4368
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
4469
<NMakeCleanCommandLine>echo ON
45-
del /s $(ProjectDir)..\appversion.h &gt;nul 2&gt;&amp;1</NMakeCleanCommandLine>
70+
del /s "$(ProjectDir)..\appversion.h" &gt;nul 2&gt;&amp;1</NMakeCleanCommandLine>
4671
<NMakeReBuildCommandLine>ECHO Setup version from Git revision
4772
IF EXIST "$(ProjectDir)..\..\version\appversion.bat" (CALL "$(ProjectDir)..\..\version\appversion.bat" "$(ProjectDir)..\..\version\" "$(SolutionDir)..\")</NMakeReBuildCommandLine>
4873
</PropertyGroup>
@@ -51,4 +76,4 @@ IF EXIST "$(ProjectDir)..\..\version\appversion.bat" (CALL "$(ProjectDir)..\..\v
5176
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
5277
<ImportGroup Label="ExtensionTargets">
5378
</ImportGroup>
54-
</Project>
79+
</Project>

0 commit comments

Comments
 (0)