Changeset 71111 in vbox

Timestamp:

Feb 23, 2018 7:44:52 AM (7 years ago)

Author:

vboxsync

Message:

Config.kmk: NewerVccVBoxGuestR3Dll tweak for building x86 binaries for amd64 build

File:

• trunk/Config.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -6619 +6619 @@
         $(VBOX_NEWER_VCC_WARN_ALL) $(VBOX_VCC_WERR)
  TEMPLATE_NewerVccVBoxGuestR3Dll_CFLAGS          = $(TEMPLATE_NewerVccVBoxGuestR3Dll_CXXFLAGS)
- TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86        = \
-        $(subst $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3Dll_TOOL.win.x86)_LIB),$(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.x86)_LIB), $(TEMPLATE_VBoxGuestR3Dll_LIBS.x86))
- TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.amd64      = \
-        $(subst $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3Dll_TOOL.win.amd64)_LIB),$(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.amd64)_LIB), $(TEMPLATE_VBoxGuestR3Dll_LIBS.amd64))
+# Hack begin
+# Does not work when building x86 for amd64 build (No rule to make target /oldnames.lib).
+# TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86        = \
+#       $(subst $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3Dll_TOOL.win.x86)_LIB),$(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.x86)_LIB), $(TEMPLATE_VBoxGuestR3Dll_LIBS.x86))
+# TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.amd64      = \
+#       $(subst $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3Dll_TOOL.win.amd64)_LIB),$(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.amd64)_LIB), $(TEMPLATE_VBoxGuestR3Dll_LIBS.amd64))
+# Directly assign TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.
+ TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86           = \
+        $(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.x86)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.x86)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
+        $(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.x86)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib
+ TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.amd64         = \
+        $(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.amd64)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.amd64)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
+        $(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib
+# Hack end
 endif