Changeset 59407 in vbox

Timestamp:

Jan 19, 2016 12:50:20 PM (9 years ago)

Author:

vboxsync

Message:

Main/proxy: Build fix

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• src-all/win/VBoxProxyStubLegacy.rc (copied) (copied from trunk/src/VBox/Main/src-all/win/VBoxProxyStub.rc ) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -1056 +1056 @@
   src-all/win/VBoxProxyStub.rc_DEPS = $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb
 
- DLLS += VBoxProxyStubLegacy
- VBoxProxyStubLegacy_TEMPLATE = VBOXMAINCOMP
- VBoxProxyStubLegacy_EXTENDS  = VBoxProxyStub
- VBoxProxyStubLegacy_DEFS     = $(VBoxProxyStub_DEFS) VBOX_IN_PROXY_STUB_LEGACY
- VBoxProxyStubLegacy_INCS     = $(VBoxCOM_0_OUTDIR)/old64/
- VBoxProxyStubLegacy_SOURCES  = \
-        $(VBoxCOM_0_OUTDIR)/old64/VirtualBox_p.c \
-        $(VBoxCOM_0_OUTDIR)/old64/VirtualBox_i.c \
-        src-all/win/VBoxProxyStub.def \
-        src-all/win/VBoxProxyStub.rc \
-        src-all/win/VBoxProxyStub.c
-  src-all/win/VBoxProxyStub.rc_DEPS = $(VBoxCOM_0_OUTDIR)/old64/VirtualBox.tlb
+ ifeq ($(KBUILD_TARGET_ARCH),amd64)
+  DLLS += VBoxProxyStubLegacy
+  VBoxProxyStubLegacy_TEMPLATE = VBOXMAINCOMP
+  VBoxProxyStubLegacy_EXTENDS  = VBoxProxyStub
+  VBoxProxyStubLegacy_DEFS     = $(VBoxProxyStub_DEFS) VBOX_IN_PROXY_STUB_LEGACY
+  VBoxProxyStubLegacy_INCS     = $(VBoxCOM_0_OUTDIR)/old64/
+  VBoxProxyStubLegacy_SOURCES  = \
+        $(VBoxCOM_0_OUTDIR)/old64/VirtualBox_p.c \
+        $(VBoxCOM_0_OUTDIR)/old64/VirtualBox_i.c \
+        src-all/win/VBoxProxyStub.def \
+        src-all/win/VBoxProxyStubLegacy.rc \
+        src-all/win/VBoxProxyStub.c
+  src-all/win/VBoxProxyStubLegacy.rc_DEPS = $(VBoxCOM_0_OUTDIR)/old64/VirtualBox.tlb
+ endif
 
  ifdef VBOX_WITH_32_ON_64_MAIN_API

trunk/src/VBox/Main/src-all/win/VBoxProxyStubLegacy.rc

@@ -16 +16 @@
  */
 
-#define IN_FILE_DESCRIPTION "VirtualBox COM Proxy Stub and Typelib"
-#define IN_FILE_BASENAME    "VBoxProxyStub"
+#define IN_FILE_DESCRIPTION "VirtualBox COM Proxy Stub and Type Library (pre Windows 7)"
+#define IN_FILE_BASENAME    "VBoxProxyStubLegacy"
 
 #include "../../../Artwork/win/TemplateDll.rc"