Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master

1 files changed, 17 insertions, 13 deletions

diff --git a/src/VBox/Additions/WINNT/VBoxMMR/Makefile.kmk b/src/VBox/Additions/WINNT/VBoxMMR/Makefile.kmk
index 0e019ef4..30641ef9 100644
--- a/src/VBox/Additions/WINNT/VBoxMMR/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/VBoxMMR/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2013 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -21,18 +21,20 @@ include $(KBUILD_PATH)/subheader.kmk
 PROGRAMS += VBoxMMR
 VBoxMMR_TEMPLATE = NewVBoxGuestR3Exe
 VBoxMMR_DEFS     = LOG_TO_BACKDOOR VBOX_WITH_HGCM
-VBoxMMR_SOURCES  = startmmr.cpp
+VBoxMMR_SOURCES  = \
+	VBoxMMR.rc \
+	startmmr.cpp
 
 DLLS += VBoxMMRHook
 
 VBoxMMRHook_TEMPLATE    = VBOXGUESTR3DLL
 VBoxMMRHook_DEFS        = LOG_TO_BACKDOOR VBGL_VBOXGUEST VBOX_WITH_HGCM UNICODE TSMFHOOK_EXPORTS VBOX_WITH_GUEST_PROPS
-VBoxMMRHook_SDKS.x86    = WINDDK
 VBoxMMRHook_SOURCES  = \
-        VBoxMMRHook.def \
-        dllmain.cpp \
-        tsmfhook.cpp \
-        logging.cpp
+	VBoxMMRHook.rc \
+	VBoxMMRHook.def \
+	dllmain.cpp \
+	tsmfhook.cpp \
+	logging.cpp
 
 #
 # 32-bit versions for inclusion on 64-bit Windows
@@ -57,14 +59,16 @@ VBoxMMRHook-x86_DEFS = $(VBoxMMRHook_DEFS) VBOX_WOW64
 #
 # Since this is not the default SDK we have to navigate manually to it.
 #
-VBOX_PATH_PSDK_v71    := \
-	$(PATH_DEVTOOLS)/win.x86/sdk/v7.1
+ifndef VBOX_OSE
+ VBOX_PATH_PSDK_v71 := $(PATH_DEVTOOLS)/win.x86/sdk/v7.1
+else
+ VBOX_PATH_PSDK_v71 := $(PATH_SDK_WINPSDK71)
+endif
 
-VBoxMMRHook_INCS        :=  \
+VBoxMMRHook_INCS := \
 	$(VBOX_PATH_PSDK_v71)/Include \
-  ../include \
-  $(SUB_DEPTH)/include   
-
+	../include \
+	$(SUB_DEPTH)/include
 
 VBoxMMRHook_LIBS.x86  := \
 	$(VBOX_PATH_PSDK_v71)/Lib/WS2_32.lib