Changeset 21250 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Jul 6, 2009 1:19:32 PM (15 years ago)

Author:

vboxsync

Message:

VBoxService: extend the standard target to make the NT4 one.

File:

• trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -22 +22 @@
 SUB_DEPTH = ../../../../..
 include $(KBUILD_PATH)/subheader.kmk
+if "$(KBUILD_HOST)" != "os2" || defined(VBOX_WITH_OS2_ADDITIONS)
 
-if "$(KBUILD_HOST)" != "os2" || defined(VBOX_WITH_OS2_ADDITIONS)
- PROGRAMS += VBoxService
-endif
-
-# Build special VBoxService version for NT4.
-ifeq ($(KBUILD_TARGET), win)
- PROGRAMS.x86 += VBoxServiceNT
-endif
+#
+# Target lists.
+#
+PROGRAMS += VBoxService
+PROGRAMS.win.x86 += VBoxServiceNT
 
 #
@@ -72 +70 @@
 
 #
-# VBoxServiceNT - NT version of VBoxService (x86 only).
+# VBoxServiceNT - NT4 version of VBoxService.
 #
 VBoxServiceNT_TEMPLATE    = VBOXGUESTR3EXE
-VBoxServiceNT_DEFS        = VBOXSERVICE_TIMESYNC
-VBoxServiceNT_DEFS       += _WIN32_WINNT=0x0400 _UNICODE UNICODE TARGET_NT4
-ifdef VBOX_WITH_GUEST_PROPS
- VBoxServiceNT_DEFS      += VBOX_WITH_GUEST_PROPS VBOXSERVICE_VMINFO
-endif
-VBoxServiceNT_SOURCES       = \
-        VBoxService.cpp \
-        VBoxServiceTimeSync.cpp \
-        VBoxServiceUtils.cpp \
-        VBoxService-win.rc \
-        VBoxService-win.cpp
-ifdef VBOX_WITH_GUEST_PROPS
- VBoxServiceNT_SOURCES     += \
-        VBoxServiceVMInfo.cpp \
-        VBoxServiceVMInfo-win.cpp
-endif
-VBoxServiceNT_LIBS          = \
-        $(VBOX_LIB_IPRT_GUEST_R3) \
-        $(VBOX_LIB_VBGL_R3) \
-        $(VBOX_LIB_IPRT_GUEST_R3)
+VBoxServiceNT_EXTENDS     = VBoxService
+VBoxServiceNT_DEFS.win    = _WIN32_WINNT=0x0400 _UNICODE UNICODE TARGET_NT4
 
+#
 # The icon is configurable.
+#
 VBoxService-win.rc_INCS = $(PATH_VBoxService)
 VBoxService-win.rc_DEPS = $(PATH_VBoxService)/VBoxService-win-icon.rc
@@ -106 +88 @@
         $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ADDITIONS_ICON_FILE))"'
 
+endif # os2 || with os2 additions
 include $(KBUILD_PATH)/subfooter.kmk