Permalink
Browse files

Adjusted build settings to detect absence of Win2k support in toolset.

  • Loading branch information...
1 parent 00daf3d commit 93954c9d690c9a1e9bb82a91a00b4f733baed65a @Lexikos committed Mar 14, 2016
Showing with 20 additions and 5 deletions.
  1. +11 −2 AutoHotkeyx.vcxproj
  2. +5 −0 Config.vcxproj
  3. +4 −3 source/config.h
View
@@ -102,7 +102,7 @@
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
<Link>
<TargetMachine>MachineX86</TargetMachine>
- <MinimumRequiredVersion>5</MinimumRequiredVersion>
+ <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
</Link>
</ItemDefinitionGroup>
<!-- platform: x64 -->
@@ -167,6 +167,15 @@
<Command Condition="exists('$(PackerPath)')">$(PackerPath)$(PackerArgs) "$(TargetPath)" &amp; exit 0</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
+ <!-- win2k support -->
+ <ItemDefinitionGroup Condition="$(SupportWin2k)">
+ <ClCompile>
+ <PreprocessorDefinitions>CONFIG_WIN2K;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <MinimumRequiredVersion>5</MinimumRequiredVersion>
+ </Link>
+ </ItemDefinitionGroup>
<!-- Visual C++ 2010 should place any newly created properties in these groups -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
@@ -285,7 +294,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<CustomBuild Include="source\lib\win2kcompat.asm">
- <ExcludedFromBuild Condition="'$(Platform)'!='Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="!$(SupportWin2k)">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="source\libx64call\x64call.asm">
<ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
View
@@ -116,5 +116,10 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
+
+ <PropertyGroup>
+ <SupportWin2k>false</SupportWin2k>
+ <SupportWin2k Condition="'$(Platform)'=='Win32' AND $(PlatformToolsetVersion) &lt;= 100">true</SupportWin2k>
+ </PropertyGroup>
</Project>
View
@@ -38,6 +38,7 @@
#define CONFIG_WINNT4
#endif
-#ifndef _WIN64
-#define CONFIG_WIN2K
-#endif
+// This is now defined via Config.vcxproj if supported by the current platform toolset.
+//#ifndef _WIN64
+//#define CONFIG_WIN2K
+//#endif

0 comments on commit 93954c9

Please sign in to comment.