Changeset 31414 in vbox

Timestamp:

Aug 5, 2010 3:43:28 PM (14 years ago)

Author:

vboxsync

Message:

Additions/XFree86: compile flag cleanup

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (2 diffs)
• src/VBox/Additions/x11/vboxvideo/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -3973 +3973 @@
  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64   = -m elf_x86_64
 endif
-TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS)   -fno-merge-constants -std=c99
-TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants
+TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS)   -fno-merge-constants -std=c99 $(VBOX_GCC_fno-stack-protector) -ffreestanding
+TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants $(VBOX_GCC_fno-stack-protector) -ffreestanding
 TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o
 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS  = \

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

@@ -146 +146 @@
 #
 ## @todo We're quite probably using the wrong template here.
-VBoxGuestR3LibXFree86_TEMPLATE = VBOXGUESTR3LIB
+VBoxGuestR3LibXFree86_TEMPLATE = VBOXGUESTR3XF86MOD
 VBoxGuestR3LibXFree86_DEFS     = \
         VBOX_WITH_HGCM \
@@ -152 +152 @@
         RTMEM_NO_WRAP_TO_EF_APIS \
         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,)
-VBoxGuestR3LibXFree86_CXXFLAGS.linux = \
-    $(VBOX_GCC_fno-stack-protector) -ffreestanding
 VBoxGuestR3LibXFree86_SOURCES  = \
         VBoxGuestR3Lib.cpp \

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

@@ -38 +38 @@
         BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
         IN_MODULE XFree86Module
- vboxvideo_drv_CFLAGS.linux := \
-        -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) \
-        $(VBOX_GCC_fno-stack-protector) -ffreestanding
  vboxvideo_drv_INCS = \
         $(VBOX_PATH_X11_XFREE_4_3)/include \