Skip to content

Commit 504908d

Browse files
Merge #176
2 parents 68e5edd + c28a3d7 commit 504908d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1597
-901
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@ ipch/
3232
*.vspx
3333
*.sap
3434

35+
36+
IntelPresentMon/AppCef/CefNano.args.json

IntelPresentMon/AppCef/CefNano.vcxproj

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>x64</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release-EDSS|x64">
9+
<Configuration>Release-EDSS</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Release|x64">
913
<Configuration>Release</Configuration>
1014
<Platform>x64</Platform>
@@ -51,7 +55,6 @@
5155
<ClInclude Include="source\util\async\LoadFile.h" />
5256
<ClInclude Include="source\util\async\StoreFile.h" />
5357
<ClInclude Include="source\util\async\BrowseReadSpec.h" />
54-
<ClInclude Include="source\util\async\BrowseFolder.h" />
5558
<ClInclude Include="source\util\async\BrowseStoreSpec.h" />
5659
<ClInclude Include="source\util\async\BindHotkey.h" />
5760
<ClInclude Include="source\util\async\ClearHotkey.h" />
@@ -116,6 +119,14 @@
116119
<CharacterSet>MultiByte</CharacterSet>
117120
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
118121
</PropertyGroup>
122+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-EDSS|x64'" Label="Configuration">
123+
<ConfigurationType>Application</ConfigurationType>
124+
<UseDebugLibraries>false</UseDebugLibraries>
125+
<PlatformToolset>v143</PlatformToolset>
126+
<WholeProgramOptimization>true</WholeProgramOptimization>
127+
<CharacterSet>MultiByte</CharacterSet>
128+
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
129+
</PropertyGroup>
119130
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
120131
<ImportGroup Label="ExtensionSettings">
121132
</ImportGroup>
@@ -130,6 +141,10 @@
130141
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
131142
<Import Project="..\..\vcpkg.props" />
132143
</ImportGroup>
144+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-EDSS|x64'" Label="PropertySheets">
145+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
146+
<Import Project="..\..\vcpkg.props" />
147+
</ImportGroup>
133148
<PropertyGroup Label="UserMacros" />
134149
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
135150
<IntDir>..\..\build\obj\$(ProjectName)-$(Platform)-$(Configuration)\</IntDir>
@@ -147,10 +162,19 @@
147162
<GenerateManifest>true</GenerateManifest>
148163
<EmbedManifest>true</EmbedManifest>
149164
</PropertyGroup>
165+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-EDSS|x64'">
166+
<IntDir>..\..\build\obj\$(ProjectName)-$(Platform)-$(Configuration)\</IntDir>
167+
<OutDir>..\..\build\$(Configuration)\</OutDir>
168+
<TargetName>PresentMon</TargetName>
169+
<LinkIncremental>false</LinkIncremental>
170+
<GenerateManifest>true</GenerateManifest>
171+
<EmbedManifest>true</EmbedManifest>
172+
</PropertyGroup>
150173
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
151174
</PropertyGroup>
152175
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
153176
</PropertyGroup>
177+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-EDSS|x64'" Label="Vcpkg" />
154178
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
155179
<ClCompile>
156180
<WarningLevel>Level3</WarningLevel>
@@ -207,6 +231,39 @@
207231
<AdditionalManifestFiles>compatibility.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
208232
</Manifest>
209233
</ItemDefinitionGroup>
234+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-EDSS|x64'">
235+
<ClCompile>
236+
<WarningLevel>Level3</WarningLevel>
237+
<FunctionLevelLinking>true</FunctionLevelLinking>
238+
<IntrinsicFunctions>true</IntrinsicFunctions>
239+
<SDLCheck>true</SDLCheck>
240+
<PreprocessorDefinitions>NDEBUG;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
241+
<ConformanceMode>true</ConformanceMode>
242+
<FloatingPointModel>Fast</FloatingPointModel>
243+
<LanguageStandard>stdcpplatest</LanguageStandard>
244+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
245+
<AdditionalIncludeDirectories>..;Cef\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
246+
</ClCompile>
247+
<Link>
248+
<SubSystem>Windows</SubSystem>
249+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
250+
<OptimizeReferences>true</OptimizeReferences>
251+
<GenerateDebugInformation>true</GenerateDebugInformation>
252+
<AdditionalLibraryDirectories>Cef\Lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
253+
<AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
254+
<UACUIAccess>true</UACUIAccess>
255+
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
256+
</Link>
257+
<PostBuildEvent>
258+
<Message>
259+
</Message>
260+
<Command>
261+
</Command>
262+
</PostBuildEvent>
263+
<Manifest>
264+
<AdditionalManifestFiles>compatibility.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
265+
</Manifest>
266+
</ItemDefinitionGroup>
210267
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
211268
<ImportGroup Label="ExtensionTargets">
212269
</ImportGroup>

0 commit comments

Comments
 (0)