Changeset 16385 in vbox

Timestamp:

Jan 29, 2009 6:48:50 PM (16 years ago)

Author:

vboxsync

Message:

Config.kmk,QtGUI/Makefile.kmk: Moved VBOX_WITH_DEBUGGER_GUI out of the global DEFS and to the VirtualBox_DEFS since VirtualBox is the only user of it.

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -530 +530 @@
   # Temporary:
   VBOX_WITH_QTGUI=
-  VBOX_WITH_MAIN=
   VBOX_WITH_DEBUGGER_GUI=
+  VBOX_WITH_PYTHON=
+  VBOX_WITH_WEBSERVICES=
+  VBOX_WITH_CROGL=
+  # Permanent (no working SDL).
   VBOX_WITH_VBOXSDL=
   VBOX_WITH_VBOXBFE=
-  VBOX_WITH_WEBSERVICES=
-  VBOX_WITH_CROGL=
  endif
 endif
@@ -1046 +1047 @@
 ifdef VBOX_WITH_DEBUGGER
  DEFS += VBOX_WITH_DEBUGGER
-endif
-ifdef VBOX_WITH_DEBUGGER_GUI
- DEFS += VBOX_WITH_DEBUGGER_GUI
 endif
 ifdef VBOX_WITH_STATISTICS
@@ -3307 +3305 @@
  TEMPLATE_VBOXGUESTR3EXE_LIBS     = pthread rt m
 endif
-if1of ($(KBUILD_TARGET),freebsd netbsd openbsd)
+if1of ($(KBUILD_TARGET), freebsd netbsd openbsd)
  TEMPLATE_VBOXGUESTR3EXE_LIBS     = $(TEMPLATE_VBOXR3EXE_LIBS) iconv
 endif

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -176 +176 @@
         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
         $(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT)
-if "$(KBUILD_TYPE)" != "release" && defined(VBOX_WITH_DEBUGGER_GUI)
- VirtualBox_DEFS         += VBOX_WITH_DEBUGGER_GUI_MENU
+ifdef VBOX_WITH_DEBUGGER_GUI
+ VirtualBox_DEFS        += VBOX_WITH_DEBUGGER_GUI
+ if "$(KBUILD_TYPE)" != "release"
+  VirtualBox_DEFS       += VBOX_WITH_DEBUGGER_GUI_MENU
+ endif
 endif