Merged PR 5409981: [Git2Git] Reflect OS build changes on top of d5bfd237e5

Some sources files changes were necessary to retain build continuity in OS.

Retrieved from https://microsoft.visualstudio.com os.2020 OS official/rs_onecore_dep_uxp 7ff895ff770838526b6d1d9e7d582f3c1e36d85b
This commit is contained in:
Dustin Howett 2020-11-16 19:28:35 +00:00
parent 7dece459ac
commit ee1c1011f7
4 changed files with 4 additions and 0 deletions

View file

@ -44,6 +44,7 @@ INCLUDES= \
$(CONSOLE_SRC_PATH)\..\oss\libpopcnt; \
$(CONSOLE_SRC_PATH)\..\oss\chromium; \
$(CONSOLE_SRC_PATH)\..\oss\fmt\include; \
$(CONSOLE_SRC_PATH)\..\oss\interval_tree; \
$(MINWIN_INTERNAL_PRIV_SDK_INC_PATH_L); \
$(MINWIN_RESTRICTED_PRIV_SDK_INC_PATH_L); \
$(MINCORE_INTERNAL_PRIV_SDK_INC_PATH_L); \

View file

@ -25,6 +25,7 @@ PRECOMPILED_INCLUDE = ..\precomp.h
SOURCES = \
..\Cluster.cpp \
..\BlinkingState.cpp \
..\FontInfo.cpp \
..\FontInfoBase.cpp \
..\FontInfoDesired.cpp \

View file

@ -70,6 +70,7 @@ INCLUDES = \
$(CONSOLE_SRC_PATH)\..\oss\libpopcnt; \
$(CONSOLE_SRC_PATH)\..\oss\chromium; \
$(CONSOLE_SRC_PATH)\..\oss\fmt\include; \
$(CONSOLE_SRC_PATH)\..\oss\interval_tree; \
$(INCLUDES) \
TARGETLIBS = \

View file

@ -56,3 +56,4 @@ TARGETLIBS = \
$(TARGETLIBS) \
$(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \
$(OBJ_PATH)\..\lib\$(O)\ConTermParser.lib \
$(OBJ_PATH)\..\..\..\types\lib\$(O)\ConTypes.lib \