Changeset 18717 in vbox

Timestamp:

Apr 5, 2009 1:17:33 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

45671

Message:

Config.kmk,Makefile.kmk,tools,Installer/win: Qt 4.4.3 rollout for Windows, 2nd take.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -3044 +3044 @@
  TEMPLATE_VBOXQT4GUIEXE_SDKS = QT4
  ifdef VBOX_WITH_QT4_SUN
-  if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.amd64 darwin.x86 linux.amd64 linux.x86 solaris.amd64 solaris.x86)
-   TEMPLATE_VBOXQT4GUIEXE_QT_INFIX = VBox
-  else ifneq ($(KBUILD_TARGET),darwin) ## @todo convert all builds to 'VBox' lib infix!
-   TEMPLATE_VBOXQT4GUIEXE_QT_PREFIX = VBox
-  endif
+  TEMPLATE_VBOXQT4GUIEXE_QT_INFIX = VBox
  endif
  TEMPLATE_VBOXQT4GUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS)

trunk/Makefile.kmk

@@ -181 +181 @@
   qt4-bin_INST = $(INST_BIN)
   qt4-bin_SOURCES = \
-        $(VBOX_PATH_QT4_LIB)/VBoxQtCore4.dll \
-        $(VBOX_PATH_QT4_LIB)/VBoxQtGui4.dll \
-        $(VBOX_PATH_QT4_LIB)/VBoxQtNetwork4.dll \
+        $(VBOX_PATH_QT4_LIB)/QtCoreVBox4.dll \
+        $(VBOX_PATH_QT4_LIB)/QtGuiVBox4.dll \
+        $(VBOX_PATH_QT4_LIB)/QtNetworkVBox4.dll \
         $(VBOX_PATH_QT4)/plugins/accessible/qtaccessiblewidgets4.dll=>accessible/qtaccessiblewidgets4.dll
- else if1of ($(KBUILD_TARGET),linux solaris)
+ else
   qt4-bin_INST = $(INST_BIN)
   qt4-bin_SOURCES = \
@@ -191 +191 @@
         $(VBOX_PATH_QT4_LIB)/libQtGuiVBox.so.4 \
         $(VBOX_PATH_QT4_LIB)/libQtNetworkVBox.so.4 \
-        $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets$(SUFF_DLL)=>accessible/libqtaccessiblewidgets$(SUFF_DLL)
- else
-  qt4-bin_INST = $(INST_BIN)
-  qt4-bin_SOURCES = \
-        $(VBOX_PATH_QT4_LIB)/libVBoxQtCore.so.4 \
-        $(VBOX_PATH_QT4_LIB)/libVBoxQtGui.so.4 \
-        $(VBOX_PATH_QT4_LIB)/libVBoxQtNetwork.so.4 \
         $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets$(SUFF_DLL)=>accessible/libqtaccessiblewidgets$(SUFF_DLL)
  endif