Changeset 10119 in vbox

Timestamp:

Jul 2, 2008 6:24:20 PM (17 years ago)

Author:

vboxsync

Message:

mkspecs todo for win.amd64, see defect.

File:

• trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk (modified) (3 diffs)

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

@@ -65 +65 @@
   ifneq ($(VBOX_PATH_QT4),)
    VBOX_WITH_QT4_SUN = 1
-  endif 
+  endif
  endif
 endif
@@ -107 +107 @@
         $(VBOX_PATH_QT4_INCLUDE)
  ifeq ($(KBUILD_TARGET),win)
+  ifeq ($(KBUILD_TARGET_ARCH),amd64)
+   ## @todo This is the correct one here: VBOX_INCS_QT4    += $(VBOX_PATH_QT4_SHARE)/mkspecs/win32-msvc2005
    VBOX_INCS_QT4    += $(VBOX_PATH_QT4_SHARE)/mkspecs/win32-msvc.net
+  else
+   VBOX_INCS_QT4    += $(VBOX_PATH_QT4_SHARE)/mkspecs/win32-msvc.net
+  endif
  else ifeq ($(KBUILD_TARGET),linux)
   VBOX_INCS_QT4     += $(VBOX_PATH_QT4_SHARE)/mkspecs/linux-g++
@@ -306 +311 @@
   endif
   ifdef VBOX_WITH_ORIGIN
-    # Qt4 on Solaris in the same as it is on other platforms (i.e. no special qtgcc/lib folders) 
+    # Qt4 on Solaris in the same as it is on other platforms (i.e. no special qtgcc/lib folders)
     TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)'
   endif