Changeset 60093 in vbox

Timestamp:

Mar 18, 2016 1:03:16 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Qt5 migration (part 109): X11: Put the legacy XCB stuff into the bin/legacy folder.

File:

• trunk/Makefile.kmk (modified) (3 diffs)

trunk/Makefile.kmk

@@ -238 +238 @@
      qt5-bin_SOURCES = \
       $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(VBOX_PATH_QT_LIB)/lib$(qtmod)$(SUFF_DLL).*.*.*)=>lib$(qtmod)$(SUFF_DLL).5) \
-      $(VBOX_PATH_QT)/plugins/platforms/libqxcb$(SUFF_DLL)=>platforms/libqxcb$(SUFF_DLL)
+      $(VBOX_PATH_QT)/plugins/platforms/libqxcb$(SUFF_DLL)=>platforms/libqxcb$(SUFF_DLL) \
+      $(VBOX_PATH_QT)/libxcb$(SUFF_DLL).1=>legacy/libxcb$(SUFF_DLL).1 \
+      $(VBOX_PATH_QT)/libX11$(SUFF_DLL).6=>legacy/libX11$(SUFF_DLL).6 \
+      $(VBOX_PATH_QT)/libX11-xcb$(SUFF_DLL).1=>legacy/libX11-xcb$(SUFF_DLL).1
     else # !VBOX_WITH_HARDENING
      # For non-hardened builds we need to remove the RUNPATH. This stuff is
@@ -245 +248 @@
      qt5-bin_SOURCES = \
       $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(qt5-bin_0_OUTDIR)/lib$(qtmod)$(SUFF_DLL).5.5.1=>lib$(qtmod)$(SUFF_DLL).5) \
-      $(qt5-bin_0_OUTDIR)/libqxcb$(SUFF_DLL)=>platforms/libqxcb$(SUFF_DLL)
+      $(qt5-bin_0_OUTDIR)/libqxcb$(SUFF_DLL)=>platforms/libqxcb$(SUFF_DLL) \
+      $(qt5-bin_0_OUTDIR)/libxcb$(SUFF_DLL).1=>legacy/libxcb$(SUFF_DLL).1 \
+      $(qt5-bin_0_OUTDIR)/libX11$(SUFF_DLL).6=>legacy/libX11$(SUFF_DLL).6 \
+      $(qt5-bin_0_OUTDIR)/libX11-xcb$(SUFF_DLL).1=>legacy/libX11-xcb$(SUFF_DLL).1
 
 $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$$(qt5-bin_0_OUTDIR)/lib$(qtmod)$(SUFF_DLL).5.5.1): \
@@ -252 +258 @@
         $(QUIET)$(CP) $^ $@
         $(QUIET)chrpath --delete $@
-    
+
 $$(qt5-bin_0_OUTDIR)/libqxcb$(SUFF_DLL): $(VBOX_PATH_QT)/plugins/platforms/libqxcb$(SUFF_DLL) \
+                | $$(qt5-bin_0_OUTDIR)/
+        $(call MSG_INST_FILE,$^,$@)
+        $(QUIET)$(CP) $^ $@
+        $(QUIET)chrpath --delete $@
+
+$$(qt5-bin_0_OUTDIR)/libxcb$(SUFF_DLL).1: $(VBOX_PATH_QT)/lib/legacy/libxcb$(SUFF_DLL).1 \
+                | $$(qt5-bin_0_OUTDIR)/
+        $(call MSG_INST_FILE,$^,$@)
+        $(QUIET)$(CP) $^ $@
+        $(QUIET)chrpath --delete $@
+
+$$(qt5-bin_0_OUTDIR)/libX11$(SUFF_DLL).6: $(VBOX_PATH_QT)/lib/legacy/libX11$(SUFF_DLL).6 \
+                | $$(qt5-bin_0_OUTDIR)/
+        $(call MSG_INST_FILE,$^,$@)
+        $(QUIET)$(CP) $^ $@
+        $(QUIET)chrpath --delete $@
+
+$$(qt5-bin_0_OUTDIR)/libX11-xcb$(SUFF_DLL).1: $(VBOX_PATH_QT)/lib/legacy/libX11-xcb$(SUFF_DLL).1 \
                 | $$(qt5-bin_0_OUTDIR)/
         $(call MSG_INST_FILE,$^,$@)