From af557a0dba5797d3386a7a87b2c3a26f2c6cb52b Mon Sep 17 00:00:00 2001 From: modeco80 Date: Sat, 30 Nov 2024 03:54:47 -0500 Subject: [PATCH] Make vs2022 path shared --- agent-vs2022/Makefile | 16 ++++++++-------- agent-vs2022/build/configs.mk | 6 ++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/agent-vs2022/Makefile b/agent-vs2022/Makefile index b48aa19..b06d69d 100644 --- a/agent-vs2022/Makefile +++ b/agent-vs2022/Makefile @@ -23,14 +23,14 @@ OBJS := $(OBJDIR)/capture.o \ $(OBJDIR)/nvfbc_library.o \ $(OBJDIR)/main.o \ -LINK_LIBS := ~/vs2022/ucrt/lib/$(ARCH)/libucrt$(D).lib \ - ~/vs2022/crt/lib/$(ARCH)/libcmt$(D).lib \ - ~/vs2022/crt/lib/$(ARCH)/libcpmt$(D).lib \ - ~/vs2022/crt/lib/$(ARCH)/libvcruntime$(D).lib \ - ~/vs2022/winsdk/lib/$(ARCH)/kernel32.lib \ - ~/vs2022/winsdk/lib/$(ARCH)/user32.lib \ - ~/vs2022/winsdk/lib/$(ARCH)/comctl32.lib \ - ~/vs2022/winsdk/lib/$(ARCH)/ws2_32.lib +LINK_LIBS := $(VS2022_PATH)/ucrt/lib/$(ARCH)/libucrt$(D).lib \ + $(VS2022_PATH)/crt/lib/$(ARCH)/libcmt$(D).lib \ + $(VS2022_PATH)/crt/lib/$(ARCH)/libcpmt$(D).lib \ + $(VS2022_PATH)/crt/lib/$(ARCH)/libvcruntime$(D).lib \ + $(VS2022_PATH)/winsdk/lib/$(ARCH)/kernel32.lib \ + $(VS2022_PATH)/winsdk/lib/$(ARCH)/user32.lib \ + $(VS2022_PATH)/winsdk/lib/$(ARCH)/comctl32.lib \ + $(VS2022_PATH)/winsdk/lib/$(ARCH)/ws2_32.lib .PHONY: all dumpinfo clean matrix diff --git a/agent-vs2022/build/configs.mk b/agent-vs2022/build/configs.mk index cfa0eae..d36be51 100644 --- a/agent-vs2022/build/configs.mk +++ b/agent-vs2022/build/configs.mk @@ -1,8 +1,10 @@ # Base compiler flags. Only change if you *explicitly* know what you're doing. +# replace this +VS2022_PATH := ~/vs2022 -RC_INCLUDES := /I ~/vs2022/winsdk/include/um /I ~/vs2022/winsdk/include/shared -SDK_INCLUDES := -isystem ~/vs2022/ucrt/include -isystem ~/vs2022/crt/include -isystem ~/vs2022/winsdk/include/shared -isystem ~/vs2022/winsdk/include/um +RC_INCLUDES := /I $(VS2022_PATH)/winsdk/include/um /I $(VS2022_PATH)/winsdk/include/shared +SDK_INCLUDES := -isystem $(VS2022_PATH)/ucrt/include -isystem $(VS2022_PATH)/crt/include -isystem $(VS2022_PATH)/winsdk/include/shared -isystem $(VS2022_PATH)/winsdk/include/um # Windows 6.1 BASE_CCFLAGS := $(SDK_INCLUDES) -D_WIN32_WINNT=0x0601 -Ires -std=c17