Changeset 59371 in vbox

Timestamp:

Jan 17, 2016 8:31:48 PM (9 years ago)

Author:

vboxsync

Message:

VBoxSVC: Don't include the registry changes when VBOX_WITH_MIDL_PROXY_STUB=1

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• src-server/win/VBoxSVC.rc (modified) (3 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -532 +532 @@
 
 src-server/win/VBoxSVC.rc_INCS  = $(VBoxSVC_0_OUTDIR)
-src-server/win/VBoxSVC.rc_DEPS  = $(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs $(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc
-src-server/win/VBoxSVC.rc_CLEAN = $(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs $(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc
-
+src-server/win/VBoxSVC.rc_DEPS  = $(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc
+src-server/win/VBoxSVC.rc_CLEAN = $(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc
 $$(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$(@D))
         $(APPEND) -t $@ '1 ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
 
+ifndef VBOX_WITH_MIDL_PROXY_STUB
+src-server/win/VBoxSVC.rc_DEPS  += $(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs
+src-server/win/VBoxSVC.rc_CLEAN += $(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs
 $$(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs: $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(dir $$(@D))
         $(VBOX_XSLTPROC) --stringparam Module VBoxSVC -o $@ $< $(VBOX_XIDL_FILE)
+endif
 
 ## @todo r=klaus unfortunately we don't have xmllint everywhere, would be

trunk/src/VBox/Main/src-server/win/VBoxSVC.rc

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2015 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -57 +57 @@
 
 
+#ifndef VBOX_WITH_MIDL_PROXY_STUB
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -63 +64 @@
 
 IDR_VIRTUALBOX REGISTRY "VBoxSVC.rgs"
+#endif
 
 1 TYPELIB "VirtualBox.tlb"