Changeset 3509 in kBuild for trunk

Timestamp:

Dec 16, 2021 11:09:26 AM (3 years ago)

Author:

bird

Message:

/Config.kmk: Experimental preps for using Visual C++ 2019 for building.

File:

• trunk/Config.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -232 +232 @@
 
 else if1of ($(KBUILD_TARGET), win nt)
- TEMPLATE_BIN_TOOL              = VCC100
- TEMPLATE_BIN_TOOL.x86          = VCC100X86
- TEMPLATE_BIN_TOOL.amd64        = VCC100AMD64
+ ifdef KBUILD_NEW_VCC
+  TEMPLATE_BIN_TOOL             = VCC142
+  TEMPLATE_BIN_TOOL.x86         = VCC142X86
+  TEMPLATE_BIN_TOOL.amd64       = VCC142AMD64
+ else
+  TEMPLATE_BIN_TOOL             = VCC100
+  TEMPLATE_BIN_TOOL.x86         = VCC100X86
+  TEMPLATE_BIN_TOOL.amd64       = VCC100AMD64
+ endif
  TEMPLATE_BIN_DEFS              = WINDOWS32 _CONSOLE __WIN__ _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_WARNINGS
  TEMPLATE_BIN_DEFS.x86          = WIN32 __WIN32__
@@ -246 +252 @@
         $(PATH_GNUMAKE_SRC)/glob
  TEMPLATE_BIN_LDFLAGS           = /SUBSYSTEM:console /INCREMENTAL:no /NOD /DEBUG /OPT:REF /OPT:ICF /LargeAddressAware
- ifeq ($(KBUILD_TYPE),profile)
-  TEMPLATE_BIN_SDKS             = WINPSDKINCS
-  TEMPLATE_BIN_CFLAGS          += -MT
-  TEMPLATE_BIN_LIBS             = \
+ ifdef KBUILD_NEW_VCC
+  ifdef KBUILD_WITH_STATIC_MSVCRT
+   TEMPLATE_BIN_SDKS            = WINPSDK71 WINSDK10-UCRT-STATIC
+   TEMPLATE_BIN_CFLAGS         += -MT
+   TEMPLATE_BIN_LIBS            = \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/vcruntime.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/libcmt.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/libcpmt.lib
+  else
+   TEMPLATE_BIN_SDKS            = WINPSDK71 WINSDK10-UCRT
+   TEMPLATE_BIN_CFLAGS         += -MD
+   TEMPLATE_BIN_LIBS            = \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/vcruntime.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/msvcrt.lib
+  endif
+ else ifeq ($(KBUILD_TYPE),profile)
+   TEMPLATE_BIN_SDKS             = WINPSDKINCS
+   TEMPLATE_BIN_CFLAGS          += -MT
+   TEMPLATE_BIN_LIBS             = \
         D:/coding/kStuff/svn/trunk/out/win.$(KBUILD_TARGET_ARCH)/release/kStuff/lib/kPrf2.lib \
         D:/coding/kStuff/svn/trunk/out/win.$(KBUILD_TARGET_ARCH)/release/kStuff/lib/kPrf2WinApiWrappersImp.lib \