common

Timestamp:

Aug 6, 2016 4:47:06 PM (8 years ago)

Author:

vboxsync

Message:

GA/common,Config.kmk: Use strict kBuild templates for building all the NT GA bits.

Location:

trunk/src/VBox/Additions/common

Files:

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

-              r62521
+              r63108
+#
 PROGRAMS += VBoxControl
+if "$(KBUILD_TARGET)" == "win" || defined(VBOX_WITH_MASOCHISTIC_WARNINGS) ## @todo use VBoxGuestR3Exe everywhere
+VBoxControl_TEMPLATE = VBoxGuestR3Exe
+else
 VBoxControl_TEMPLATE = NewVBoxGuestR3Exe
+endif
 ifeq ($(KBUILD_TARGET),win)
  ifdef VBOX_SIGN_ADDITIONS # (See the main Windows Additions makefile.)

r62521	r63108
233	233	#
234	234	#PROGRAMS += VBoxGuestInst
235		VBoxGuestInst_TEMPLATE= ~~New~~VBoxGuestR3Exe
	235	VBoxGuestInst_TEMPLATE= VBoxGuestR3Exe
236	236	VBoxGuestInst_SOURCES = win/VBoxGuestInst.cpp
237	237	endif

-              r62521
+              r63108
 # VBoxGuestR3Lib
+#
+if "$(KBUILD_TARGET)" == "win" || defined(VBOX_WITH_MASOCHISTIC_WARNINGS) ## @todo use VBoxGuestR3Lib everywhere
+VBoxGuestR3Lib_TEMPLATE    = VBoxGuestR3Lib
+else
 VBoxGuestR3Lib_TEMPLATE    = VBOXGUESTR3LIB
+endif
 VBoxGuestR3Lib_DEFS        = \
         VBOX_WITH_HGCM \
 …
 # VBoxGuestR3LibShared - a PIC variant of VBoxGuestR3Lib for linking into .so/.dll/.dylib.
+#
+if "$(KBUILD_TARGET)" == "win" || defined(VBOX_WITH_MASOCHISTIC_WARNINGS) ## @todo use VBoxGuestR3Lib everywhere
+VBoxGuestR3LibShared_TEMPLATE = VBoxGuestR3Dll
+else
 VBoxGuestR3LibShared_TEMPLATE = VBOXGUESTR3DLL
+endif
 VBoxGuestR3LibShared_DEFS    := $(VBoxGuestR3Lib_DEFS)
 VBoxGuestR3LibShared_SOURCES := $(VBoxGuestR3Lib_SOURCES)

-              r60583
+              r63108
 # VBoxService
+#
+if "$(KBUILD_TARGET)" == "win" || defined(VBOX_WITH_MASOCHISTIC_WARNINGS) ## @todo use VBoxGuestR3Exe everywhere
+VBoxService_TEMPLATE      = VBoxGuestR3Exe
+else
 VBoxService_TEMPLATE      = NewVBoxGuestR3Exe
+endif
 # Define features to be activate.
 …
 # VBoxServiceNT - NT4 version of VBoxService.
+#
 VBoxServiceNT_TEMPLATE = NewVBoxGuestR3Exe
+VBoxServiceNT_TEMPLATE = VBoxGuestR3Exe
 VBoxServiceNT_EXTENDS  = VBoxService
 VBoxServiceNT_DEFS.win = _WIN32_WINNT=0x0400 TARGET_NT4 VBOX_WITH_VBOXSERVICE_MANAGEMENT

r62521	r63108
27	27	# tstUserInfo
28	28	#
29		tstUserInfo_TEMPLATE = ~~New~~VBoxGuestR3Exe
	29	tstUserInfo_TEMPLATE = VBoxGuestR3Exe
30	30	tstUserInfo_SOURCES = \
31	31	tstUserInfo.cpp

r62521	r63108
27	27	# tstPageFusion
28	28	#
29		tstPageFusion_TEMPLATE = ~~New~~VBoxGuestR3Exe
	29	tstPageFusion_TEMPLATE = VBoxGuestR3Exe
30	30	tstPageFusion_DEFS.win += _WIN32_WINNT=0x0501
31	31	tstPageFusion_SOURCES = \

Note: See TracChangeset for help on using the changeset viewer.