Changeset 3637

Timestamp:

Nov 2, 2024, 2:54:01 AM (12 days ago)

Author:

bird

Message:

Config.kmk,Makefile.kmk,src/misc/Makefile.kmk: Build adjustments for KBUILD_NEW_VCC (VC++ 2022).

Location:

trunk

Files:

• Config.kmk (modified) (4 diffs)
• Makefile.kmk (modified) (1 diff)
• src/misc/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -126 +126 @@
 # Not all compiler tools currently do the same quoting of DEFS, so here's a
 # temporary workaround.
-ifn1of ($(KBUILD_TARGET), win)
+if "$(KBUILD_TARGET)" != "win" || defined(KBUILD_NEW_VCC)
  TMP_QUOTE_SLASH :=
 else
@@ -241 +241 @@
 else if1of ($(KBUILD_TARGET), win nt)
  ifdef KBUILD_NEW_VCC
-  TEMPLATE_BIN_TOOL             = VCC142
-  TEMPLATE_BIN_TOOL.x86         = VCC142X86
-  TEMPLATE_BIN_TOOL.amd64       = VCC142AMD64
+  TEMPLATE_BIN_TOOL             = VCC143
+  TEMPLATE_BIN_TOOL.x86         = VCC143X86
+  TEMPLATE_BIN_TOOL.amd64       = VCC143AMD64
  else
   TEMPLATE_BIN_TOOL             = VCC100
@@ -249 +249 @@
   TEMPLATE_BIN_TOOL.amd64       = VCC100AMD64
  endif
+ TEMPLATE_BIN_TOOL.arm64        = VCC143ARM64
  TEMPLATE_BIN_DEFS              = WINDOWS32 _CONSOLE __WIN__ _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_WARNINGS
  TEMPLATE_BIN_DEFS.x86          = WIN32 __WIN32__
@@ -262 +263 @@
  ifdef KBUILD_NEW_VCC
   ifdef KBUILD_WITH_STATIC_MSVCRT
-   TEMPLATE_BIN_SDKS            = WINPSDK71 WINSDK10-UCRT-STATIC
+   TEMPLATE_BIN_SDKS            = WINSDK10-UM 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
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.$(KBUILD_TARGET_ARCH))_LIB)/vcruntime.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.$(KBUILD_TARGET_ARCH))_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.$(KBUILD_TARGET_ARCH))_LIB)/libcmt.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.$(KBUILD_TARGET_ARCH))_LIB)/libcpmt.lib
   else
-   TEMPLATE_BIN_SDKS            = WINPSDK71 WINSDK10-UCRT
+   TEMPLATE_BIN_SDKS            = WINSDK10-UM 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
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.$(KBUILD_TARGET_ARCH))_LIB)/vcruntime.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.$(KBUILD_TARGET_ARCH))_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.$(KBUILD_TARGET_ARCH))_LIB)/msvcrt.lib
   endif
  else ifeq ($(KBUILD_TYPE),profile)

trunk/Makefile.kmk

@@ -75 +75 @@
 
 if1of ($(KBUILD_TARGET), nt win)
+ ifndef KBUILD_NEW_VCC
 kBuild_bin_SOURCES.$(KBUILD_TARGET) = \
-        kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/msvcr100.dll
+        kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/msvcr100.dll
+ endif
 kBuild_bin_SOURCES.profile = \
         D:/coding/kStuff/svn/trunk/out/win.$(KBUILD_TARGET_ARCH)/release/kStuff/bin/kPrf2.dll \

trunk/src/misc/Makefile.kmk

@@ -50 +50 @@
 PROGRAMS.win += $1
 $1_TEMPLATE   = EXECWRAPPER
-$1_DEFS       = TARGET_EXE_NAME=\"$2.exe\"
+$1_DEFS       = TARGET_EXE_NAME=$(TMP_QUOTE_SLASH)"$2.exe$(TMP_QUOTE_SLASH)"
 endef