Changeset 29808 in vbox for trunk/src/VBox

Timestamp:

May 26, 2010 10:28:11 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: cleanup

File:

• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (9 diffs)

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

@@ -91 +91 @@
 endif
 VirtualBox_SDKS.win = WINPSDK DXSDK
-ifeq ($(filter-out freebsd linux netbsd openbsd os2,$(KBUILD_TARGET)),) # X11 + os2 ## @todo solaris
+if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd os2) # X11 + os2 ## @todo solaris
  VirtualBox_SDKS += LIBSDL
 endif
@@ -102 +102 @@
 VirtualBox_DEFS           =
 VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
-VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QUARTZ2D VBOX_GUI_USE_QIMAGE VBOX_WITHOUT_QHTTP
+VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QUARTZ2D VBOX_GUI_USE_QIMAGE
 ifndef VBOX_WITH_COCOA_QT
 VirtualBox_DEFS.darwin.x86= USE_HID_FOR_MODIFIERS
@@ -112 +112 @@
 VirtualBox_DEFS.solaris   = VBOX_GUI_USE_QIMAGE #VBOX_GUI_USE_SDL
 VirtualBox_DEFS.win       = VBOX_GUI_USE_QIMAGE UNICODE QT_DLL
-VirtualBox_DEFS.win.amd64 = VBOX_WITHOUT_QHTTP
 ifdef VBOX_WITH_ICHAT_THEATER
  VirtualBox_DEFS.darwin += VBOX_WITH_ICHAT_THEATER
@@ -138 +137 @@
 ifdef VBOX_WITH_VIDEOHWACCEL
  VirtualBox_DEFS        += VBOX_WITH_VIDEOHWACCEL \
-            VBOX_GUI_USE_QGL
+        VBOX_GUI_USE_QGL
 else ifdef VBOX_GUI_USE_QGL
  VirtualBox_DEFS        += VBOX_GUI_USE_QGL
@@ -215 +214 @@
 
 VirtualBox_LDFLAGS.darwin = \
-        -framework IOKit -framework AppKit -framework ApplicationServices -framework Foundation -framework Carbon \
+        -framework AppKit -framework Carbon \
         $(if $(VBOX_WITH_HARDENING),-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VirtualBox.dylib)
-VirtualBox_LDFLAGS.darwin.x86 = -framework QuickTime
 ifdef VBOX_WITH_ICHAT_THEATER
  VirtualBox_LDFLAGS.darwin += -framework InstantMessage -framework QuartzCore
@@ -229 +227 @@
         $(PATH_SDK_DXSDK_LIB)/ddraw.lib \
         $(PATH_SDK_DXSDK_LIB)/dxguid.lib
-ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
+if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
  VirtualBox_LIBS         += $(PATH_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
 endif
@@ -480 +478 @@
         src/darwin/UICocoaDockIconPreview.mm
 
-ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
+if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
  ifndef VBOX_OSE
   VirtualBox_QT_MOCHDRS += \
@@ -541 +539 @@
 
 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
-VirtualBox_QT_MODULES += OpenGL
+ VirtualBox_QT_MODULES += OpenGL
 endif
 
@@ -743 +741 @@
                 '-DVBOX_GUI_USE_QUARTZ2D' \
                 '-DVBOX_GUI_USE_QIMAGE' \
-                '-DVBOX_WITHOUT_QHTTP' \
                 '-o' $@ $<
 endif