Skip to content

Commit 30052c1

Browse files
stanardstanard
committed
Fixed MiniEngine build failure with missing GDK
1 parent a6c390d commit 30052c1

File tree

7 files changed

+50
-43
lines changed

7 files changed

+50
-43
lines changed

‎MiniEngine/Core/Core.vcxproj‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|Gaming.Desktop.x64">
4+
<ProjectConfiguration Include="Debug|x64">
55
<Configuration>Debug</Configuration>
6-
<Platform>Gaming.Desktop.x64</Platform>
6+
<Platform>x64</Platform>
77
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Profile|Gaming.Desktop.x64">
8+
<ProjectConfiguration Include="Profile|x64">
99
<Configuration>Profile</Configuration>
10-
<Platform>Gaming.Desktop.x64</Platform>
10+
<Platform>x64</Platform>
1111
</ProjectConfiguration>
12-
<ProjectConfiguration Include="Release|Gaming.Desktop.x64">
12+
<ProjectConfiguration Include="Release|x64">
1313
<Configuration>Release</Configuration>
14-
<Platform>Gaming.Desktop.x64</Platform>
14+
<Platform>x64</Platform>
1515
</ProjectConfiguration>
1616
</ItemGroup>
1717
<PropertyGroup Label="Globals">
@@ -37,7 +37,7 @@
3737
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3838
<Import Project="..\PropertySheets\Build.props" />
3939
</ImportGroup>
40-
<ImportGroup Condition="'$(Platform)'=='Gaming.Desktop.x64'" Label="PropertySheets">
40+
<ImportGroup Condition="'$(Platform)'=='x64'" Label="PropertySheets">
4141
<Import Project="..\PropertySheets\Desktop.props" />
4242
</ImportGroup>
4343
<PropertyGroup Label="UserMacros" />
@@ -48,7 +48,7 @@
4848
<RuntimeTypeInfo>true</RuntimeTypeInfo>
4949
</ClCompile>
5050
</ItemDefinitionGroup>
51-
<ItemDefinitionGroup Condition="'$(Platform)'=='Gaming.Desktop.x64'">
51+
<ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
5252
<Link>
5353
<AdditionalDependencies>d3d11.lib;dxguid.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
5454
<SubSystem>Windows</SubSystem>
@@ -437,6 +437,7 @@
437437
<ItemDefinitionGroup>
438438
<ClCompile>
439439
<AdditionalIncludeDirectories>..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\include;..\..\Packages\WinPixEventRuntime.1.0.210209001\Include\WinPixEventRuntime;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
440+
<PreprocessorDefinitions>_GAMING_DESKTOP;__WRL_NO_DEFAULT_LIB__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
440441
</ClCompile>
441442
</ItemDefinitionGroup>
442443
<ImportGroup Label="ExtensionTargets">

‎MiniEngine/Core/Display.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
#include "ImageScaling.h"
2323
#include "TemporalEffects.h"
2424

25+
#pragma comment(lib, "dxgi.lib")
26+
2527
// This macro determines whether to detect if there is an HDR display and enable HDR10 output.
2628
// Currently, with HDR display enabled, the pixel magnfication functionality is broken.
2729
#define CONDITIONALLY_ENABLE_HDR_OUTPUT 1

‎MiniEngine/Core/GameCore.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#include "Util/CommandLineArg.h"
2424
#include <shellapi.h>
2525

26+
#pragma comment(lib, "runtimeobject.lib")
27+
2628
namespace GameCore
2729
{
2830
using namespace Graphics;

‎MiniEngine/Core/GraphicsCore.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
#include "TemporalEffects.h"
3333
#include "Display.h"
3434

35+
#pragma comment(lib, "d3d12.lib")
36+
3537
#ifdef _GAMING_DESKTOP
3638
#include <winreg.h> // To read the registry
3739
#endif

‎MiniEngine/Model/Model.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|Gaming.Desktop.x64">
4+
<ProjectConfiguration Include="Debug|x64">
55
<Configuration>Debug</Configuration>
6-
<Platform>Gaming.Desktop.x64</Platform>
6+
<Platform>x64</Platform>
77
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Profile|Gaming.Desktop.x64">
8+
<ProjectConfiguration Include="Profile|x64">
99
<Configuration>Profile</Configuration>
10-
<Platform>Gaming.Desktop.x64</Platform>
10+
<Platform>x64</Platform>
1111
</ProjectConfiguration>
12-
<ProjectConfiguration Include="Release|Gaming.Desktop.x64">
12+
<ProjectConfiguration Include="Release|x64">
1313
<Configuration>Release</Configuration>
14-
<Platform>Gaming.Desktop.x64</Platform>
14+
<Platform>x64</Platform>
1515
</ProjectConfiguration>
1616
</ItemGroup>
1717
<PropertyGroup Label="Globals">
@@ -37,7 +37,7 @@
3737
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3838
<Import Project="..\PropertySheets\Build.props" />
3939
</ImportGroup>
40-
<ImportGroup Condition="'$(Platform)'=='Gaming.Desktop.x64'" Label="PropertySheets">
40+
<ImportGroup Condition="'$(Platform)'=='x64'" Label="PropertySheets">
4141
<Import Project="..\PropertySheets\Desktop.props" />
4242
</ImportGroup>
4343
<PropertyGroup Label="UserMacros" />
@@ -48,7 +48,7 @@
4848
<RuntimeTypeInfo>true</RuntimeTypeInfo>
4949
</ClCompile>
5050
</ItemDefinitionGroup>
51-
<ItemDefinitionGroup Condition="'$(Platform)'=='Gaming.Desktop.x64'">
51+
<ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
5252
<Link>
5353
<AdditionalDependencies>d3d11.lib;dxguid.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
5454
<SubSystem>Windows</SubSystem>

‎MiniEngine/ModelViewer/ModelViewer.sln‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@ Global
1616
Release|Windows = Release|Windows
1717
EndGlobalSection
1818
GlobalSection(ProjectConfigurationPlatforms) = postSolution
19-
{1813BD6E-E2AF-4A3C-8C54-4E72119DA993}.Debug|Windows.ActiveCfg = Debug|Gaming.Desktop.x64
20-
{1813BD6E-E2AF-4A3C-8C54-4E72119DA993}.Debug|Windows.Build.0 = Debug|Gaming.Desktop.x64
21-
{1813BD6E-E2AF-4A3C-8C54-4E72119DA993}.Profile|Windows.ActiveCfg = Profile|Gaming.Desktop.x64
22-
{1813BD6E-E2AF-4A3C-8C54-4E72119DA993}.Profile|Windows.Build.0 = Profile|Gaming.Desktop.x64
23-
{1813BD6E-E2AF-4A3C-8C54-4E72119DA993}.Release|Windows.ActiveCfg = Release|Gaming.Desktop.x64
24-
{1813BD6E-E2AF-4A3C-8C54-4E72119DA993}.Release|Windows.Build.0 = Release|Gaming.Desktop.x64
25-
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Debug|Windows.ActiveCfg = Debug|Gaming.Desktop.x64
26-
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Debug|Windows.Build.0 = Debug|Gaming.Desktop.x64
27-
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Profile|Windows.ActiveCfg = Profile|Gaming.Desktop.x64
28-
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Profile|Windows.Build.0 = Profile|Gaming.Desktop.x64
29-
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Release|Windows.ActiveCfg = Release|Gaming.Desktop.x64
30-
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Release|Windows.Build.0 = Release|Gaming.Desktop.x64
31-
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Debug|Windows.ActiveCfg = Debug|Gaming.Desktop.x64
32-
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Debug|Windows.Build.0 = Debug|Gaming.Desktop.x64
33-
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Profile|Windows.ActiveCfg = Profile|Gaming.Desktop.x64
34-
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Profile|Windows.Build.0 = Profile|Gaming.Desktop.x64
35-
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Release|Windows.ActiveCfg = Release|Gaming.Desktop.x64
36-
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Release|Windows.Build.0 = Release|Gaming.Desktop.x64
19+
{1813BD6E-E2AF-4A3C-8C54-4E72119DA993}.Debug|Windows.ActiveCfg = Debug|x64
20+
{1813BD6E-E2AF-4A3C-8C54-4E72119DA993}.Debug|Windows.Build.0 = Debug|x64
21+
{1813BD6E-E2AF-4A3C-8C54-4E72119DA993}.Profile|Windows.ActiveCfg = Profile|x64
22+
{1813BD6E-E2AF-4A3C-8C54-4E72119DA993}.Profile|Windows.Build.0 = Profile|x64
23+
{1813BD6E-E2AF-4A3C-8C54-4E72119DA993}.Release|Windows.ActiveCfg = Release|x64
24+
{1813BD6E-E2AF-4A3C-8C54-4E72119DA993}.Release|Windows.Build.0 = Release|x64
25+
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Debug|Windows.ActiveCfg = Debug|x64
26+
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Debug|Windows.Build.0 = Debug|x64
27+
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Profile|Windows.ActiveCfg = Profile|x64
28+
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Profile|Windows.Build.0 = Profile|x64
29+
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Release|Windows.ActiveCfg = Release|x64
30+
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Release|Windows.Build.0 = Release|x64
31+
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Debug|Windows.ActiveCfg = Debug|x64
32+
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Debug|Windows.Build.0 = Debug|x64
33+
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Profile|Windows.ActiveCfg = Profile|x64
34+
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Profile|Windows.Build.0 = Profile|x64
35+
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Release|Windows.ActiveCfg = Release|x64
36+
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Release|Windows.Build.0 = Release|x64
3737
EndGlobalSection
3838
GlobalSection(SolutionProperties) = preSolution
3939
HideSolutionNode = FALSE

‎MiniEngine/ModelViewer/ModelViewer.vcxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|Gaming.Desktop.x64">
4+
<ProjectConfiguration Include="Debug|x64">
55
<Configuration>Debug</Configuration>
6-
<Platform>Gaming.Desktop.x64</Platform>
6+
<Platform>x64</Platform>
77
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Profile|Gaming.Desktop.x64">
8+
<ProjectConfiguration Include="Profile|x64">
99
<Configuration>Profile</Configuration>
10-
<Platform>Gaming.Desktop.x64</Platform>
10+
<Platform>x64</Platform>
1111
</ProjectConfiguration>
12-
<ProjectConfiguration Include="Release|Gaming.Desktop.x64">
12+
<ProjectConfiguration Include="Release|x64">
1313
<Configuration>Release</Configuration>
14-
<Platform>Gaming.Desktop.x64</Platform>
14+
<Platform>x64</Platform>
1515
</ProjectConfiguration>
1616
</ItemGroup>
1717
<PropertyGroup Label="Globals">
@@ -37,7 +37,7 @@
3737
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3838
<Import Project="..\PropertySheets\Build.props" />
3939
</ImportGroup>
40-
<ImportGroup Condition="'$(Platform)'=='Gaming.Desktop.x64'" Label="PropertySheets">
40+
<ImportGroup Condition="'$(Platform)'=='x64'" Label="PropertySheets">
4141
<Import Project="..\PropertySheets\Desktop.props" />
4242
</ImportGroup>
4343
<PropertyGroup Label="UserMacros" />
@@ -49,7 +49,7 @@
4949
<AdditionalOptions>/nodefaultlib:MSVCRT %(AdditionalOptions)</AdditionalOptions>
5050
</Link>
5151
</ItemDefinitionGroup>
52-
<ItemDefinitionGroup Condition="'$(Platform)'=='Gaming.Desktop.x64'">
52+
<ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
5353
<Link>
5454
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
5555
</AdditionalDependencies>
@@ -357,7 +357,7 @@
357357
<Link>
358358
<AdditionalLibraryDirectories>..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\lib_release;..\..\Packages\directxtex_desktop_win10.2019.2.7.1\lib\x64\Release;..\..\Packages\directxmesh_desktop_win10.2019.2.7.1\lib\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
359359
<AdditionalDependencies>zlibstatic.lib;DirectXMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
360-
<AdditionalDependencies Condition="'$(Platform)'=='Gaming.Desktop.x64'">DirectXTex.lib;%(AdditionalDependencies)</AdditionalDependencies>
360+
<AdditionalDependencies Condition="'$(Platform)'=='x64'">DirectXTex.lib;%(AdditionalDependencies)</AdditionalDependencies>
361361
</Link>
362362
</ItemDefinitionGroup>
363363
<ImportGroup Label="ExtensionTargets">

0 commit comments

Comments
 (0)