Skip to content

Port OSS consumption changes from OS PR !12826284 #18853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2025
Merged

Port OSS consumption changes from OS PR !12826284 #18853

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
517918d
Port OSS consumption changes from OS PR !12826284
DHowett Apr 28, 2025
129eb9e
Update src/project.inc
DHowett Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/audio/midi/lib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/buffer/out/lib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/buffer/out/ut_textbuffer/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/host/exe/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/host/ft_host/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/host/lib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/host/ut_host/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/host/ut_lib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/interactivity/base/lib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/interactivity/onecore/lib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/interactivity/win32/lib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

1 change: 1 addition & 0 deletions src/interactivity/win32/sources.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,5 @@ INCLUDES = \
..; \

TARGETLIBS = \
$(TARGETLIBS) \
$(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \
2 changes: 1 addition & 1 deletion src/interactivity/win32/ut_interactivity_win32/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

5 changes: 2 additions & 3 deletions src/project.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
# Pull our dependencies from vcpkg. This includes gsl - if you run into errors
# from a missing gsl, make sure you go build onecore/window/vcpkg first.

!include $(PROJECT_ROOT)\vcpkg\consume.inc
!include $(PROJECT_ROOT)\core\console\vcpkg\consume.inc

# -------------------------------------
# Preprocessor Settings
# -------------------------------------

UNICODE = 1
C_DEFINES = $(C_DEFINES) -DUNICODE -D_UNICODE -DFMT_HEADER_ONLY -D__INSIDE_WINDOWS -DBUILD_ONECORE_INTERACTIVITY
C_DEFINES = $(C_DEFINES) -DUNICODE -D_UNICODE -D__INSIDE_WINDOWS -DBUILD_ONECORE_INTERACTIVITY

# -------------------------------------
# CRT Configuration
Expand Down Expand Up @@ -50,7 +50,6 @@ INCLUDES= \
$(CONSOLE_SRC_PATH)\inc; \
$(CONSOLE_SRC_PATH)\..\..\inc; \
$(CONSOLE_SRC_PATH)\..\oss\chromium; \
$(CONSOLE_SRC_PATH)\..\oss\fmt\include; \
$(CONSOLE_SRC_PATH)\..\oss\interval_tree; \
$(CONSOLE_SRC_PATH)\..\oss\pcg\include; \
$(MINWIN_INTERNAL_PRIV_SDK_INC_PATH_L); \
Expand Down
2 changes: 1 addition & 1 deletion src/project.unittest.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Preprocessor Settings
# -------------------------------------

C_DEFINES = $(C_DEFINES) -DINLINE_TEST_METHOD_MARKUP -DUNIT_TESTING -DFMT_HEADER_ONLY
C_DEFINES = $(C_DEFINES) -DINLINE_TEST_METHOD_MARKUP -DUNIT_TESTING

# -------------------------------------
# Program Information
Expand Down
1 change: 1 addition & 0 deletions src/propsheet/sources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ INCLUDES = \
..\host; \

TARGETLIBS = \
$(TARGETLIBS) \
$(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 \
Expand Down
2 changes: 1 addition & 1 deletion src/propsheet/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/propslib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/renderer/base/lib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/renderer/gdi/lib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/renderer/wddmcon/lib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/server/lib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/terminal/adapter/lib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/terminal/adapter/ut_adapter/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/terminal/input/lib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

4 changes: 2 additions & 2 deletions src/terminal/parser/ft_fuzzer/sources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# - Console Virtual Terminal Parser Fuzzer
# -------------------------------------

!include $(PROJECT_ROOT)\vcpkg\consume.inc
!include ..\..\..\..\..\vcpkg\consume.inc

# This program will generate fuzz input for the parsing engine
# and is to be used in conjunction with the fuzz wrapper tool.
Expand Down Expand Up @@ -47,6 +47,7 @@ C_DEFINES = $(C_DEFINES) -DUNICODE -D_UNICODE

USE_STD_CPP20 = 1
MSC_WARNING_LEVEL = /W4 /WX
USER_C_FLAGS = $(USER_C_FLAGS) /Zc:preprocessor /fp:contract /utf-8

# -------------------------------------
# Build System Settings
Expand All @@ -68,7 +69,6 @@ SOURCES = \
INCLUDES = \
..\..\..\inc; \
$(CONSOLE_SRC_PATH)\..\oss\chromium; \
$(CONSOLE_SRC_PATH)\..\oss\fmt\include; \
$(CONSOLE_SRC_PATH)\..\oss\interval_tree; \
$(INCLUDES) \

Expand Down
2 changes: 1 addition & 1 deletion src/terminal/parser/ft_fuzzer/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/terminal/parser/ft_fuzzwrapper/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/terminal/parser/lib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/terminal/parser/ut_parser/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/til/ut_til/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

1 change: 1 addition & 0 deletions src/tools/vtpipeterm/sources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ USE_NATIVE_EH = 1
C_DEFINES=-DUNICODE -D__INSIDE_WINDOWS

TARGETLIBS=\
$(TARGETLIBS) \
$(MINWIN_EXTERNAL_SDK_LIB_PATH_L)\ntdll.lib \
$(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib

Expand Down
2 changes: 1 addition & 1 deletion src/tsf/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/types/lib/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

2 changes: 1 addition & 1 deletion src/types/ut_types/sources.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BUILD_PASS1_CONSUMES= \
onecore\windows\vcpkg|PASS1 \
onecore\windows\core\console\vcpkg|PASS1 \

Loading