Changeset 53492 in vbox for trunk

Timestamp:

Dec 9, 2014 3:24:06 PM (10 years ago)

Author:

vboxsync

Message:

Some fixes for windows cross build using wine.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (2 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -5045 +5045 @@
 TEMPLATE_VBoxBldProg_DEFS               := IN_RING3 LOG_DISABLED
 TEMPLATE_VBoxBldProg_DEFS.win           := _CRT_SECURE_NO_DEPRECATE
-TEMPLATE_VBoxBldProg_ASTOOL             := $(VBOX_ASTOOL)
-TEMPLATE_VBoxBldProg_ASFLAGS.x86        := $(VBOX_ASFLAGS32)
-TEMPLATE_VBoxBldProg_ASFLAGS.amd64      := $(VBOX_ASFLAGS64)
+ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
+ TEMPLATE_VBoxBldProg_ASTOOL            := $(VBOX_ASTOOL)
+ TEMPLATE_VBoxBldProg_ASFLAGS.x86       := $(VBOX_ASFLAGS32)
+ TEMPLATE_VBoxBldProg_ASFLAGS.amd64     := $(VBOX_ASFLAGS64)
+else
+ TEMPLATE_VBoxBldProg_ASTOOL            := YASM
+ TEMPLATE_VBoxBldProg_ASFLAGS           := -D__YASM__ -Worphan-labels
+ if1of ($(KBUILD_HOST),win)
+  TEMPLATE_VBoxBldProg_ASFLAGS          += -g cv8 -DASM_FORMAT_ELF
+  TEMPLATE_VBoxBldProg_ASFLAGS.x86      := -f win32
+  TEMPLATE_VBoxBldProg_ASFLAGS.amd64    := -f win64
+ else if1of ($(KBUILD_HOST),darwin)
+  TEMPLATE_VBoxBldProg_ASFLAGS          += -DASM_FORMAT_MACHO
+  TEMPLATE_VBoxBldProg_ASFLAGS.x86      := -f macho32
+  TEMPLATE_VBoxBldProg_ASFLAGS.amd64    := -f macho64
+ else
+  TEMPLATE_VBoxBldProg_ASFLAGS          += -g dwarf2 -DASM_FORMAT_ELF
+  TEMPLATE_VBoxBldProg_ASFLAGS.x86      := -f elf32
+  TEMPLATE_VBoxBldProg_ASFLAGS.amd64    := -f elf64
+ endif
+  TEMPLATE_VBoxBldProg_ASFLAGS.amd64    += $(VBOX_YASM_Wno-segreg-in-64bit)
+endif
 ifeq ($(KBUILD_HOST),win)
  TEMPLATE_VBoxBldProg_TOOL              := $(VBOX_VCC_TOOL_STEM)$(toupper $(KBUILD_HOST_ARCH))

trunk/src/VBox/Main/Makefile.kmk

@@ -456 +456 @@
         $(PATH_STAGE_LIB)/WinNetConfig$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) \
-        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Newdev.lib \
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/newdev.lib \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
         $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/WbemUuid.Lib
@@ -670 +670 @@
  VBoxC_LIBS.win += \
         $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) \
-        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Newdev.lib \
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/newdev.lib \
         $(PATH_STAGE_LIB)/WinNetConfig$(VBOX_SUFF_LIB) \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1221 +1221 @@
         common/zip/xarvfs.cpp \
         , $(RuntimeR3_SOURCES))
+if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_HOST)" != "win"
+RuntimeBldProg_SOURCES         += \
+        common/err/errmsgxpcom.cpp
+endif