Skip to content

Commit 2d1ec5e

Browse files
committed
Fix a few source paths
1 parent 27f4f1a commit 2d1ec5e

5 files changed

Lines changed: 13 additions & 5 deletions

File tree

TextLayoutSampler.vcxproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@
6464
<PrecompiledHeader>NotUsing</PrecompiledHeader>
6565
<PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
6666
<AdditionalOptions>/ifcSearchDir $(IntDir)</AdditionalOptions>
67-
<AdditionalIncludeDirectories>
68-
</AdditionalIncludeDirectories>
67+
<AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6968
<DisableSpecificWarnings>
7069
</DisableSpecificWarnings>
7170
<TreatSpecificWarningsAsErrors>4456;4457;4459</TreatSpecificWarningsAsErrors>
File renamed without changes.

source/Common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#pragma once
55

66
#ifndef USE_CPP_MODULES
7-
#ifdef __cpp_modules
7+
#ifdef __cpp_modules // Does this not work as a feature test macro in VS2019?
88
#define USE_CPP_MODULES 1
99
#else
1010
#define USE_CPP_MODULES 0

source/MainWindow.ixx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#endif
3737

3838
#include "precomp.h"
39-
#include "resource.h"
39+
#include "resource/resource.h"
4040
#include "Application.macros.h"
4141
#include "WindowUtility.macros.h"
4242

source/MessageBoxShaded.ixx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,17 @@
99
#endif
1010

1111
#include "precomp.h"
12-
#include "resource.h"
12+
#include "resource/resource.h"
1313
#include <string>
14+
15+
#ifndef WIN32_LEAN_AND_MEAN
16+
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
17+
#define NOMINMAX
18+
#define NOSERVICE
19+
#define NOMCX
20+
#define NOIME
21+
#endif
22+
1423
#include <Windows.h>
1524

1625
#if USE_CPP_MODULES

0 commit comments

Comments
 (0)