Changeset 4398 in vbox

Timestamp:

Aug 28, 2007 9:44:44 AM (17 years ago)

Author:

vboxsync

Message:

qt 3.3.8 for windows amd64.

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -1125 +1125 @@
   VBOX_PATH_QT ?= $(PATH_DEVTOOLS_TRG)/qt/v3.3.3
   LIB_QT ?= $(VBOX_PATH_QT)/lib/dynamic/qt-mt333.lib
- else
-  VBOX_PATH_QT ?= $(PATH_DEVTOOLS_TRG)/qt/v3.3.6
-  LIB_QT ?= $(VBOX_PATH_QT)/lib/dynamic/qt-mt336.lib
- endif
   LIB_QTMAIN ?= $(VBOX_PATH_QT)/lib/dynamic/qtmain.lib
+ else
+  VBOX_PATH_QT ?= $(PATH_DEVTOOLS_TRG)/qt/v3.3.8
+  LIB_QT ?= $(VBOX_PATH_QT)/lib/qt-mt338.lib
+  LIB_QTMAIN ?= $(VBOX_PATH_QT)/lib/qtmain.lib
+ endif
  ifndef QTDIR
   QTDIR := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/v*))

trunk/Makefile.kmk

@@ -6 +6 @@
 #
 #  Copyright (C) 2006-2007 innotek GmbH
-# 
+#
 #  This file is part of VirtualBox Open Source Edition (OSE), as
 #  available from http://www.virtualbox.org. This file is free software;
@@ -61 +61 @@
    VBOX_DLL_QT ?= $(VBOX_PATH_QT)/bin/qt-mt333.dll
   else ifeq ($(BUILD_TARGET).$(BUILD_TARGET_ARCH),win.amd64)
-   VBOX_DLL_QT ?= $(PATH_DEVTOOLS)/win.amd64/Qt/v3.3.6/bin/qt-mt336.dll=>qt-mt336.dll
+   VBOX_DLL_QT ?= $(PATH_DEVTOOLS)/win.amd64/Qt/v3.3.8/lib/qt-mt338.dll=>qt-mt338.dll
   #else ifeq ($(BUILD_TARGET).$(BUILD_TARGET_ARCH),os2.x86)
   # VBOX_DLL_QT ?= $(PATH_DEVTOOLS)/os2.x86/Qt/v3.3.6/bin/qt-mt336.dll=>qt-mt336.dll
@@ -149 +149 @@
 
 #
-# Install staged binaries on platforms where we can't cross 
+# Install staged binaries on platforms where we can't cross
 # compile things.
 #

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

@@ -6 +6 @@
 #
 #  Copyright (C) 2006-2007 innotek GmbH
-# 
+#
 #  This file is part of VirtualBox Open Source Edition (OSE), as
 #  available from http://www.virtualbox.org. This file is free software;
@@ -164 +164 @@
 VirtualBox_DEFS           = VBOX_GUI_SEPARATE_VM_PROCESS
 VirtualBox_DEFS.debug     = VBOX_GUI_DEBUG VBOX_CHECK_STATE # QT_FATAL_ASSERT
-VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QIMAGE
+VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QIMAGE VBOX_WITHOUT_QHTTP
 VirtualBox_DEFS.linux     = VBOX_GUI_USE_SDL
 VirtualBox_DEFS.win       = VBOX_GUI_USE_QIMAGE UNICODE QT_DLL
+VirtualBox_DEFS.win.amd64 = VBOX_WITHOUT_QHTTP
 VirtualBox_DEFS.os2       = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL QT_DLL
 #ifndef VBOX_OSE