From ce0eaab9acf8cda7ed80497159c36d2f8fc05d21 Mon Sep 17 00:00:00 2001
From: "Dustin L. Howett (MSFT)" <duhowett@microsoft.com>
Date: Fri, 24 May 2019 12:28:30 -0700
Subject: [PATCH] inbox: Merge accumulated build fixes from
 RS_ONECORE_DEP_ACIOSS (#1002)

* Merged PR 3302855

[Git2Git] Git Train: Merge of building/rs_onecore_dep_acioss/190523-1700 into official/rs_onecore_dep_acioss Retrieved from official/rs_onecore_dep_acioss 3fceea90bee761aa93d91c0184a7217d1e2d404b

Related work items: #18974333
---
 src/terminal/parser/ft_fuzzer/sources | 6 +++---
 src/testlist/sources                  | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/terminal/parser/ft_fuzzer/sources b/src/terminal/parser/ft_fuzzer/sources
index 8707044ea..f524334a1 100644
--- a/src/terminal/parser/ft_fuzzer/sources
+++ b/src/terminal/parser/ft_fuzzer/sources
@@ -31,8 +31,6 @@ STL_VER                 = STL_VER_CURRENT
 USE_NATIVE_EH           = 1
 
 BUILD_FOR_CORESYSTEM    = 1
-ATL_VER                 = 70
-USE_STATIC_ATL          = 1
 
 # -------------------------------------
 # Preprocessor Settings
@@ -63,7 +61,9 @@ PRECOMPILED_INCLUDE     =   stdafx.h
 SOURCES = \
     VTCommandFuzzer.cpp \
 
-
+INCLUDES = \
+    ..\..\..\inc \
+    $(INCLUDES) \
 
 TARGETLIBS = \
     $(TARGETLIBS) \
diff --git a/src/testlist/sources b/src/testlist/sources
index 1319cfbd8..de0493fa9 100644
--- a/src/testlist/sources
+++ b/src/testlist/sources
@@ -18,4 +18,5 @@ TESTLIST_REFERENCE_DIRS=\
     $(OBJ_PATH)\..\host\ft_uia\$O \
     $(OBJ_PATH)\..\terminal\adapter\ut_adapter\$O \
     $(OBJ_PATH)\..\terminal\parser\ut_parser\$O \
+    $(OBJ_PATH)\..\types\ut_types\$O \
     $(ONECORE_PRIVATE_PATH)\minkernel\lib\$(TARGET_DIRECTORY)\testmetadata\console \