Skip to content

Commit 1343bd3

Browse files
justanotheranonymoususerjustanotheranonymoususer
committed
Cleaned up solution properties, added x64 build
1 parent 8fe1ea8 commit 1343bd3

File tree

3 files changed

+103
-35
lines changed

3 files changed

+103
-35
lines changed

‎recaps.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,10 +393,10 @@ void SaveConfiguration(const KeyboardLayoutInfo* info)
393393
const WCHAR *pLocaleName;
394394

395395
pLocaleName = info->names[info->main];
396-
RegSetValueEx(hkey, L"main", 0, REG_SZ, (const BYTE *)(pLocaleName), (wcslen(pLocaleName) + 1) * sizeof(WCHAR));
396+
RegSetValueEx(hkey, L"main", 0, REG_SZ, (const BYTE *)(pLocaleName), (DWORD)((wcslen(pLocaleName) + 1) * sizeof(WCHAR)));
397397

398398
pLocaleName = info->names[info->paired];
399-
RegSetValueEx(hkey, L"paired", 0, REG_SZ, (const BYTE *)(pLocaleName), (wcslen(pLocaleName) + 1) * sizeof(WCHAR));
399+
RegSetValueEx(hkey, L"paired", 0, REG_SZ, (const BYTE *)(pLocaleName), (DWORD)((wcslen(pLocaleName) + 1) * sizeof(WCHAR)));
400400

401401
RegCloseKey(hkey);
402402
}

‎recaps.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,19 @@ EndProject
77
Global
88
GlobalSection(SolutionConfigurationPlatforms) = preSolution
99
Debug|Win32 = Debug|Win32
10+
Debug|x64 = Debug|x64
1011
Release|Win32 = Release|Win32
12+
Release|x64 = Release|x64
1113
EndGlobalSection
1214
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1315
{A6546042-77AD-46B0-B4B4-63641E29810E}.Debug|Win32.ActiveCfg = Debug|Win32
1416
{A6546042-77AD-46B0-B4B4-63641E29810E}.Debug|Win32.Build.0 = Debug|Win32
17+
{A6546042-77AD-46B0-B4B4-63641E29810E}.Debug|x64.ActiveCfg = Debug|x64
18+
{A6546042-77AD-46B0-B4B4-63641E29810E}.Debug|x64.Build.0 = Debug|x64
1519
{A6546042-77AD-46B0-B4B4-63641E29810E}.Release|Win32.ActiveCfg = Release|Win32
1620
{A6546042-77AD-46B0-B4B4-63641E29810E}.Release|Win32.Build.0 = Release|Win32
21+
{A6546042-77AD-46B0-B4B4-63641E29810E}.Release|x64.ActiveCfg = Release|x64
22+
{A6546042-77AD-46B0-B4B4-63641E29810E}.Release|x64.Build.0 = Release|x64
1723
EndGlobalSection
1824
GlobalSection(SolutionProperties) = preSolution
1925
HideSolutionNode = FALSE

‎recaps.vcxproj‎

Lines changed: 95 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,18 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Release|Win32">
913
<Configuration>Release</Configuration>
1014
<Platform>Win32</Platform>
1115
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
1220
</ItemGroup>
1321
<PropertyGroup Label="Globals">
1422
<ProjectGuid>{A6546042-77AD-46B0-B4B4-63641E29810E}</ProjectGuid>
@@ -22,55 +30,62 @@
2230
<UseOfMfc>false</UseOfMfc>
2331
<CharacterSet>Unicode</CharacterSet>
2432
</PropertyGroup>
33+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
34+
<ConfigurationType>Application</ConfigurationType>
35+
<PlatformToolset>v120</PlatformToolset>
36+
<UseOfMfc>false</UseOfMfc>
37+
<CharacterSet>Unicode</CharacterSet>
38+
</PropertyGroup>
2539
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2640
<ConfigurationType>Application</ConfigurationType>
2741
<PlatformToolset>v120</PlatformToolset>
2842
<UseOfMfc>false</UseOfMfc>
2943
<CharacterSet>Unicode</CharacterSet>
3044
</PropertyGroup>
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
46+
<ConfigurationType>Application</ConfigurationType>
47+
<PlatformToolset>v120</PlatformToolset>
48+
<UseOfMfc>false</UseOfMfc>
49+
<CharacterSet>Unicode</CharacterSet>
50+
</PropertyGroup>
3151
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3252
<ImportGroup Label="ExtensionSettings">
3353
</ImportGroup>
3454
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
3555
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3656
</ImportGroup>
57+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
58+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
59+
</ImportGroup>
3760
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
3861
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3962
</ImportGroup>
63+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
64+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
65+
</ImportGroup>
4066
<PropertyGroup Label="UserMacros" />
4167
<PropertyGroup>
4268
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
4369
</PropertyGroup>
44-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
45-
<OutDir>.\Release\</OutDir>
46-
<IntDir>.\Release\</IntDir>
47-
</PropertyGroup>
48-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
49-
<OutDir>.\Debug\</OutDir>
50-
<IntDir>.\Debug\</IntDir>
51-
</PropertyGroup>
70+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
71+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
72+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
73+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
5274
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
5375
<ClCompile>
5476
<Optimization>MaxSpeed</Optimization>
55-
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
5677
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5778
<StringPooling>true</StringPooling>
5879
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
5980
<FunctionLevelLinking>true</FunctionLevelLinking>
6081
<PrecompiledHeader>Use</PrecompiledHeader>
6182
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
62-
<PrecompiledHeaderOutputFile>.\Release/recaps.pch</PrecompiledHeaderOutputFile>
63-
<AssemblerListingLocation>.\Release/</AssemblerListingLocation>
64-
<ObjectFileName>.\Release/</ObjectFileName>
65-
<ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
6683
<WarningLevel>Level4</WarningLevel>
6784
<SuppressStartupBanner>true</SuppressStartupBanner>
6885
</ClCompile>
6986
<Link>
7087
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
71-
<OutputFile>.\Release/recaps.exe</OutputFile>
7288
<SuppressStartupBanner>true</SuppressStartupBanner>
73-
<ProgramDatabaseFile>.\Release/recaps.pdb</ProgramDatabaseFile>
7489
<SubSystem>Windows</SubSystem>
7590
<TargetMachine>MachineX86</TargetMachine>
7691
</Link>
@@ -79,12 +94,40 @@
7994
<MkTypLibCompatible>true</MkTypLibCompatible>
8095
<SuppressStartupBanner>true</SuppressStartupBanner>
8196
<TargetEnvironment>Win32</TargetEnvironment>
82-
<TypeLibraryName>.\Release/recaps.tlb</TypeLibraryName>
97+
<TypeLibraryName>$(IntDir)/recaps.tlb</TypeLibraryName>
8398
<HeaderFileName />
8499
</Midl>
85100
<ResourceCompile>
86101
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
87-
<Culture>0x040d</Culture>
102+
</ResourceCompile>
103+
</ItemDefinitionGroup>
104+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
105+
<ClCompile>
106+
<Optimization>MaxSpeed</Optimization>
107+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108+
<StringPooling>true</StringPooling>
109+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
110+
<FunctionLevelLinking>true</FunctionLevelLinking>
111+
<PrecompiledHeader>Use</PrecompiledHeader>
112+
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
113+
<WarningLevel>Level4</WarningLevel>
114+
<SuppressStartupBanner>true</SuppressStartupBanner>
115+
</ClCompile>
116+
<Link>
117+
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
118+
<SuppressStartupBanner>true</SuppressStartupBanner>
119+
<SubSystem>Windows</SubSystem>
120+
</Link>
121+
<Midl>
122+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123+
<MkTypLibCompatible>true</MkTypLibCompatible>
124+
<SuppressStartupBanner>true</SuppressStartupBanner>
125+
<TypeLibraryName>$(IntDir)/recaps.tlb</TypeLibraryName>
126+
<HeaderFileName>
127+
</HeaderFileName>
128+
</Midl>
129+
<ResourceCompile>
130+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
88131
</ResourceCompile>
89132
</ItemDefinitionGroup>
90133
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -95,49 +138,68 @@
95138
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
96139
<PrecompiledHeader>Use</PrecompiledHeader>
97140
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
98-
<PrecompiledHeaderOutputFile>.\Debug/recaps.pch</PrecompiledHeaderOutputFile>
99-
<AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
100-
<ObjectFileName>.\Debug/</ObjectFileName>
101-
<ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
102141
<WarningLevel>Level4</WarningLevel>
103142
<SuppressStartupBanner>true</SuppressStartupBanner>
104143
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
105144
</ClCompile>
106145
<Link>
107146
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
108-
<OutputFile>.\Debug/recaps.exe</OutputFile>
109147
<SuppressStartupBanner>true</SuppressStartupBanner>
110148
<GenerateDebugInformation>true</GenerateDebugInformation>
111-
<ProgramDatabaseFile>.\Debug/recaps.pdb</ProgramDatabaseFile>
112149
<SubSystem>Windows</SubSystem>
113150
<TargetMachine>MachineX86</TargetMachine>
151+
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
114152
</Link>
115153
<Midl>
116154
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117155
<MkTypLibCompatible>true</MkTypLibCompatible>
118156
<SuppressStartupBanner>true</SuppressStartupBanner>
119157
<TargetEnvironment>Win32</TargetEnvironment>
120-
<TypeLibraryName>.\Debug/recaps.tlb</TypeLibraryName>
158+
<TypeLibraryName>$(IntDir)/recaps.tlb</TypeLibraryName>
121159
<HeaderFileName />
122160
</Midl>
123161
<ResourceCompile>
124162
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125-
<Culture>0x040d</Culture>
163+
</ResourceCompile>
164+
</ItemDefinitionGroup>
165+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
166+
<ClCompile>
167+
<Optimization>Disabled</Optimization>
168+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
169+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
170+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
171+
<PrecompiledHeader>Use</PrecompiledHeader>
172+
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
173+
<WarningLevel>Level4</WarningLevel>
174+
<SuppressStartupBanner>true</SuppressStartupBanner>
175+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
176+
</ClCompile>
177+
<Link>
178+
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
179+
<SuppressStartupBanner>true</SuppressStartupBanner>
180+
<GenerateDebugInformation>true</GenerateDebugInformation>
181+
<SubSystem>Windows</SubSystem>
182+
</Link>
183+
<Midl>
184+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
185+
<MkTypLibCompatible>true</MkTypLibCompatible>
186+
<SuppressStartupBanner>true</SuppressStartupBanner>
187+
<TypeLibraryName>$(IntDir)/recaps.tlb</TypeLibraryName>
188+
<HeaderFileName>
189+
</HeaderFileName>
190+
</Midl>
191+
<ResourceCompile>
192+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126193
</ResourceCompile>
127194
</ItemDefinitionGroup>
128195
<ItemGroup>
129196
<ClCompile Include="fixlayouts.cpp" />
130-
<ClCompile Include="recaps.cpp">
131-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
132-
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
133-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
134-
</ClCompile>
197+
<ClCompile Include="recaps.cpp" />
135198
<ClCompile Include="StdAfx.cpp">
136-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
137-
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
138199
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
139-
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
200+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
140201
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
202+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
141203
</ClCompile>
142204
<ClCompile Include="trayicon.cpp" />
143205
<ClCompile Include="utils.cpp" />

0 commit comments

Comments
 (0)