Changeset 46031 in vbox

Timestamp:

May 13, 2013 4:15:16 PM (12 years ago)

Author:

vboxsync

Message:

Cannot define two RT_OS_XXX macros at the same time, sorry, was never intended to work.

File:

• trunk/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk

@@ -55 +55 @@
 #
 
-# As there are differences between the Windows build of the service and others,
-# we do an additional build with RT_OS_WINDOWS defined on non-Windows targets.
-PROGRAMS += \
-    tstSharedFolderService \
-    $(if $(eq $(KBUILD_TARGET),win),,tstSharedFolderService-win)
-
+PROGRAMS += tstSharedFolderService \
 tstSharedFolderService_TEMPLATE = VBOXR3TSTEXE
 tstSharedFolderService_DEFS     = VBOX_WITH_HGCM UNITTEST
@@ -74 +69 @@
 tstSharedFolderService_LIBS     = $(LIB_RUNTIME)
 
+if 0 # Cannot define two RT_OS_XXX macros!
+# As there are differences between the Windows build of the service and others,
+# we do an additional build with RT_OS_WINDOWS defined on non-Windows targets.
+PROGRAMS += \
+    tstSharedFolderService \
+    $(if $(eq $(KBUILD_TARGET),win),,tstSharedFolderService-win)
 tstSharedFolderService-win_TEMPLATE = $(tstSharedFolderService_TEMPLATE)
 tstSharedFolderService-win_DEFS     = \
@@ -83 +84 @@
     $(tstSharedFolderService_LDFLAGS.darwin)
 tstSharedFolderService-win_LIBS     = $(tstSharedFolderService_LIBS)
+endif
 
 endif # VBOX_WITH_TESTCASES