Changeset 48320 in vbox

Timestamp:

Sep 5, 2013 5:34:14 PM (11 years ago)

Author:

vboxsync

Message:

Config.kmk: Make VBOXMAINEXE usable with BLD_TRG_ARCH.

File:

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

trunk/Config.kmk

@@ -4032 +4032 @@
  #       C4065 is about default only switches.
  #       C4996 is about deprected function (CRT only?).
- TEMPLATE_VBOXMAINEXE_TOOL               = $(VBOX_VCC_TOOL)
+ #TEMPLATE_VBOXMAINEXE_TOOL               = $(VBOX_VCC_TOOL)
+ TEMPLATE_VBOXMAINEXE_TOOL.win.x86       = $(VBOX_VCC_TOOL_STEM)X86
+ TEMPLATE_VBOXMAINEXE_TOOL.win.amd64     = $(VBOX_VCC_TOOL_STEM)AMD64
  TEMPLATE_VBOXMAINEXE_CXXFLAGS           = -Zi -Zl -GR -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4996 -wd4250 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
  TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug     = -RTCsu
@@ -4050 +4052 @@
         /DISALLOWLIB:msvcprt$(VBOX_VCC_CRT_TYPE_N).lib
  TEMPLATE_VBOXMAINEXE_LIBS               = \
-        $(LIB_RUNTIME) \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcrt$(VBOX_VCC_CRT_TYPE).lib \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/oldnames.lib \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_LIB)/atls$(VBOX_VCC_CRT_TYPE).lib
+        $(LIB_RUNTIME)
+ TEMPLATE_VBOXMAINEXE_LIBS.x86           = \
+        $(PATH_TOOL_$(TEMPLATE_VBOXMAINEXE_TOOL.win.x86)_LIB)/msvcrt$(VBOX_VCC_CRT_TYPE).lib \
+        $(PATH_TOOL_$(TEMPLATE_VBOXMAINEXE_TOOL.win.x86)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib \
+        $(PATH_TOOL_$(TEMPLATE_VBOXMAINEXE_TOOL.win.x86)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_VBOXMAINEXE_TOOL.win.x86)_ATLMFC_LIB)/atls$(VBOX_VCC_CRT_TYPE).lib
+ TEMPLATE_VBOXMAINEXE_LIBS.amd64         = \
+        $(PATH_TOOL_$(TEMPLATE_VBOXMAINEXE_TOOL.win.amd64)_LIB)/msvcrt$(VBOX_VCC_CRT_TYPE).lib \
+        $(PATH_TOOL_$(TEMPLATE_VBOXMAINEXE_TOOL.win.amd64)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib \
+        $(PATH_TOOL_$(TEMPLATE_VBOXMAINEXE_TOOL.win.amd64)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_VBOXMAINEXE_TOOL.win.amd64)_ATLMFC_LIB)/atls$(VBOX_VCC_CRT_TYPE).lib
  TEMPLATE_VBOXMAINEXE_POST_CMDS          = $(VBOX_SIGN_IMAGE_CMDS)