maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merged PR 3367347: [Git2Git] Git Train: FI of official/rs_onecore_dep into official/rs_onecore_dep_acioss Retrieved from https://microsoft.visualstudio.com os OS official/rs_onecore_dep_acioss 6fa4fbe485365ed72be2f557621fe58d4fc75197

Browse source 
[Git2Git] Git Train: FI of official/rs_onecore_dep into official/rs_onecore_dep_acioss Retrieved from https://microsoft.visualstudio.com os OS official/rs_onecore_dep_acioss 6fa4fbe485365ed72be2f557621fe58d4fc75197

Related work items: #18974333
This commit is contained in:
Michael Niksa 2019-06-11 23:59:12 +00:00 committed by Dustin Howett
parent 7cda7ce405
commit bfb18dd605
16 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/host/sources.inc
View file

@ -132,6 +132,7 @@ INCLUDES = \
$(SHELL_INC_PATH); \
$(INTERNAL_SDK_INC_PATH); \
$(ONECORE_INTERNAL_SDK_INC_PATH); \
$(ONECORE_EXTERNAL_SDK_INC_PATH); \
# Anything defined here will be defined BEFORE the CRT items the build system adds.
CRTLIBS = \
@ -144,11 +145,11 @@ TARGETLIBS = \
$(ONECORE_INTERNAL_SDK_LIB_PATH)\onecoreuuid.lib \
$(ONECOREUAP_INTERNAL_SDK_LIB_PATH)\onecoreuapuuid.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\onecore_internal.lib \
$(SDK_LIB_PATH)\propsys.lib \
$(SDK_LIB_PATH)\d2d1.lib \
$(SDK_LIB_PATH)\dwrite.lib \
$(SDK_LIB_PATH)\dxgi.lib \
$(SDK_LIB_PATH)\d3d11.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\propsys.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d2d1.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dwrite.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dxgi.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-edputil-policy-l1.lib \

2
src/interactivity/win32/sources.inc
View file

@ -64,4 +64,4 @@ INCLUDES = \
..; \
TARGETLIBS = \
$(ONECORE_SDK_LIB_VPATH)\onecore.lib \
$(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \

10
src/interactivity/win32/ut_interactivity_win32/sources
View file

@ -37,11 +37,11 @@ TARGETLIBS = \
$(ONECORE_INTERNAL_SDK_LIB_PATH)\onecoreuuid.lib \
$(ONECOREUAP_INTERNAL_SDK_LIB_PATH)\onecoreuapuuid.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\onecore_internal.lib \
$(SDK_LIB_PATH)\propsys.lib \
$(SDK_LIB_PATH)\d2d1.lib \
$(SDK_LIB_PATH)\dwrite.lib \
$(SDK_LIB_PATH)\dxgi.lib \
$(SDK_LIB_PATH)\d3d11.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\propsys.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d2d1.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dwrite.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dxgi.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-edputil-policy-l1.lib \

1
src/project.inc
View file

@ -41,6 +41,7 @@ INCLUDES= \
$(MINWIN_INTERNAL_PRIV_SDK_INC_PATH_L); \
$(MINCORE_INTERNAL_PRIV_SDK_INC_PATH_L); \
$(ONECORE_INTERNAL_SDK_INC_PATH); \
$(ONECORE_EXTERNAL_SDK_INC_PATH); \
# -------------------------------------
# Linker Settings

2
src/project.unittest.inc
View file

@ -31,7 +31,7 @@ INCLUDES = \
TARGETLIBS = \
$(TARGETLIBS) \
$(ONECORE_SDK_LIB_VPATH)\onecore.lib \
$(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \
$(ONECORESDKTOOLS_INTERNAL_LIB_PATH_L)\WexTest\Cue\Wex.Common.lib \
$(ONECORESDKTOOLS_INTERNAL_LIB_PATH_L)\WexTest\Cue\Wex.Logger.lib \
$(ONECORESDKTOOLS_INTERNAL_LIB_PATH_L)\WexTest\Cue\Te.Common.lib \

4
src/propsheet/sources
View file

@ -77,8 +77,8 @@ INCLUDES = \
..\host; \
TARGETLIBS = \
$(ONECORE_SDK_LIB_VPATH)\onecore.lib \
$(ONECORE_SDK_LIB_VPATH)\onecoreuap.lib \
$(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \
$(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecoreuap.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\onecore_internal.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\onecoreuap_internal.lib \
$(ONECOREUAP_INTERNAL_SDK_LIB_PATH)\onecoreuapuuid.lib \

2
src/terminal/adapter/sources.inc
View file

@ -46,7 +46,7 @@ INCLUDES = \
TARGETLIBS= \
$(TARGETLIBS) \
$(ONECORE_SDK_LIB_VPATH)\onecore.lib \
$(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-ntuser-keyboard-l1.lib \
DLOAD_ERROR_HANDLER = kernelbase

10
src/terminal/adapter/ut_adapter/sources
View file

@ -41,11 +41,11 @@ TARGETLIBS = \
$(ONECORE_INTERNAL_SDK_LIB_PATH)\onecoreuuid.lib \
$(ONECOREUAP_INTERNAL_SDK_LIB_PATH)\onecoreuapuuid.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\onecore_internal.lib \
$(SDK_LIB_PATH)\propsys.lib \
$(SDK_LIB_PATH)\d2d1.lib \
$(SDK_LIB_PATH)\dwrite.lib \
$(SDK_LIB_PATH)\dxgi.lib \
$(SDK_LIB_PATH)\d3d11.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\propsys.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d2d1.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dwrite.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dxgi.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-edputil-policy-l1.lib \

2
src/terminal/parser/ft_fuzzer/sources
View file

@ -67,5 +67,5 @@ INCLUDES = \
TARGETLIBS = \
$(TARGETLIBS) \
$(ONECORE_SDK_LIB_VPATH)\onecore.lib \
$(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\onecore_internal.lib \

2
src/terminal/parser/ft_fuzzwrapper/sources
View file

@ -53,5 +53,5 @@ INCLUDES = \
TARGETLIBS = \
$(TARGETLIBS) \
$(ONECORE_SDK_LIB_VPATH)\onecore.lib \
$(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \
$(OBJ_PATH)\..\lib\$(O)\ConTermParser.lib \

10
src/terminal/parser/ut_parser/sources
View file

@ -33,11 +33,11 @@ TARGETLIBS = \
$(ONECORE_INTERNAL_SDK_LIB_PATH)\onecoreuuid.lib \
$(ONECOREUAP_INTERNAL_SDK_LIB_PATH)\onecoreuapuuid.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\onecore_internal.lib \
$(SDK_LIB_PATH)\propsys.lib \
$(SDK_LIB_PATH)\d2d1.lib \
$(SDK_LIB_PATH)\dwrite.lib \
$(SDK_LIB_PATH)\dxgi.lib \
$(SDK_LIB_PATH)\d3d11.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\propsys.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d2d1.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dwrite.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dxgi.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-edputil-policy-l1.lib \

6
src/tools/integrity/exeuwp/sources
View file

@ -25,9 +25,9 @@ INCLUDES= \
..\lib; \
TARGETLIBS= \
$(MINCORE_SDK_LIB_PATH)\mincore.lib \
$(MINCORE_SDK_LIB_PATH)\mincore_legacy.lib \
$(SDK_LIB_PATH)\onecoreuap.lib \
$(MINCORE_EXTERNAL_SDK_LIB_PATH_L)\mincore.lib \
$(MINCORE_EXTERNAL_SDK_LIB_PATH_L)\mincore_legacy.lib \
$(ONECORE_EXTERNAL_SDK_LIB_PATH)\onecoreuap.lib \
$(WINCORE_OBJ_PATH)\console\open\src\tools\integrity\lib\$(O)\conintegritylib.lib \
SOURCES= \

2
src/tools/integrity/exewin32/sources
View file

@ -20,7 +20,7 @@ USE_NATIVE_EH = 1
C_DEFINES=-DUNICODE
TARGETLIBS=\
$(MINCORE_SDK_LIB_PATH)\mincore.lib \
$(MINCORE_EXTERNAL_SDK_LIB_PATH_L)\mincore.lib \
$(WINCORE_OBJ_PATH)\console\open\src\tools\integrity\lib\$(O)\conintegritylib.lib \
SOURCES=main.cpp \

2
src/tools/nihilist/sources
View file

@ -15,7 +15,7 @@ USE_UNICRT=1
C_DEFINES=-DUNICODE
TARGETLIBS=\
$(MINCORE_SDK_LIB_PATH)\mincore.lib \
$(MINCORE_EXTERNAL_SDK_LIB_PATH_L)\mincore.lib \
SOURCES=main.cpp \
res.rc \

4
src/tools/vtpipeterm/sources
View file

@ -19,8 +19,8 @@ USE_NATIVE_EH = 1
C_DEFINES=-DUNICODE -D__INSIDE_WINDOWS
TARGETLIBS=\
$(MINWIN_SDK_LIB_PATH)\ntdll.lib \
$(ONECORE_SDK_LIB_VPATH)\onecore.lib
$(MINWIN_EXTERNAL_SDK_LIB_PATH_L)\ntdll.lib \
$(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib
SOURCES=main.cpp \
VtConsole.cpp \

1
src/tsf/sources
View file

@ -56,3 +56,4 @@ INCLUDES = \
$(ONECORE_PRIV_SDK_INC_PATH); \
$(MINWIN_INTERNAL_PRIV_SDK_INC_PATH_L); \
$(SDK_INC_PATH)\atl30; \
$(ONECORE_EXTERNAL_SDK_INC_PATH)\atl30; \