Changeset 6599 in vbox for trunk

Timestamp:

Jan 30, 2008 1:30:33 PM (17 years ago)

Author:

vboxsync

Message:

Added VBOXGUESTR3CPPEXE.

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• src/VBox/Additions/x11/xclient/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -2714 +2714 @@
 TEMPLATE_VBOXGUESTR3EXE_EXTENDS = VBOXR3EXE
 #TEMPLATE_VBOXGUESTR3EXE_TOOL   := $(subst GXX,GCC,$(TEMPLATE_VBOXR3EXE_TOOL))
+TEMPLATE_VBOXGUESTR3EXE_TOOL   := $(subst GXX,GCC,$(VBOX_GCC32_TOOL))
+TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS= $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -fno-exceptions
 endif
 TEMPLATE_VBOXGUESTR3EXE_INST    = $(INST_ADDITIONS)
@@ -2740 +2742 @@
 TEMPLATE_VBOXGUESTR3LIB_EXTENDS = VBOXGUESTR3EXE
 TEMPLATE_VBOXGUESTR3LIB_INST    = $(INST_ADDITIONS_LIB)
-if1of ($(BUILD_TARGET),solaris)
+if1of ($(BUILD_TARGET), solaris) ## @todo r=bird: Fix the *R3Mini template to VBOXGUESTR3DLL and remove this hack.
  TEMPLATE_VBOXGUESTR3LIB_DEFS       = $(TEMPLATE_VBOXGUESTR3EXE_DEFS) PIC
  TEMPLATE_VBOXGUESTR3LIB_CFLAGS     = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fPIC
@@ -2765 +2767 @@
 TEMPLATE_VBOXGUESTR0LIB_INST    = $(INST_ADDITIONS_LIB)
 
-## @todo X11?
+#
+# Template for guest stuff that makes use of the C++ library and features.
+#
+TEMPLATE_VBOXGUESTR3CPPEXE         = VBox Guest Program with C++ library dependencies
+TEMPLATE_VBOXGUESTR3CPPEXE_EXTENDS = VBOXGUESTR3EXE
+ifdef TEMPLATE_VBOXGUESTR3CPPEXE_TOOL
+ TEMPLATE_VBOXGUESTR3CPPEXE_TOOL  := $(subst GXX,GCC,$(VBOX_GCC32_TOOL))
+ TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS = $(filter-out -fno-exceptions,$(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS))
+endif
+
 
 #

trunk/src/VBox/Additions/x11/xclient/Makefile.kmk

@@ -23 +23 @@
 #
 PROGRAMS += VBoxClient
-ifneq ($(BUILD_TARGET),linux)
- VBoxClient_TEMPLATE = VBOXGUESTR3EXE
+ifneq ($(BUILD_TARGET),linux) ## @todo Elimiate this too.
+ VBoxClient_TEMPLATE = VBOXGUESTR3CPPEXE
 else
  VBoxClient_TEMPLATE = VBOXLNX32GUESTR3EXE