- Timestamp:
- Mar 3, 2022 1:01:44 PM (3 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
-
Config.kmk (modified) (2 diffs)
-
Makefile.kmk (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r94050 r94073 7543 7543 7544 7544 ifeq ($(KBUILD_TARGET), darwin) 7545 VBOX_QT_MOD = QtCore QtGui QtWidgets QtPrintSupport QtMacExtras $(if $(VBOX_GUI_USE_QGL),QtOpenGL,) 7545 VBOX_QT_MOD := QtCore QtGui QtWidgets QtPrintSupport 7546 ifndef VBOX_WITH_QT6 7547 VBOX_QT_MOD += QtMacExtras 7548 endif 7549 ifdef VBOX_GUI_USE_QGL 7550 VBOX_QT_MOD += QtOpenGL 7551 endif 7546 7552 else if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris win) 7547 7553 VBOX_QT_MOD += Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport $(if $(VBOX_GUI_USE_QGL),Qt5OpenGL,) … … 7854 7860 TEMPLATE_VBOXQTGUIEXE_POST_CMDS = $(QUIET)install_name_tool $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \ 7855 7861 $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT6)/, \ 7856 -change "$(prefix)$(qtmod).framework/Versions/ 6/$(qtmod)" \7857 "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/ 5/$(qtmod)" ) ) "$(out)"7862 -change "$(prefix)$(qtmod).framework/Versions/A/$(qtmod)" \ 7863 "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/A/$(qtmod)" ) ) "$(out)" 7858 7864 endif 7859 7865 endif -
trunk/Makefile.kmk
r93322 r94073 213 213 # 214 214 ifeq ($(KBUILD_TARGET),darwin) 215 include $(KBUILD_PATH)/units/qt5.kmk 215 ifdef VBOX_WITH_QT6 216 include $(KBUILD_PATH)/units/qt6.kmk 217 VBOX_QT_FWRK_VER = A 218 VBOX_QT_PATH = $(PATH_SDK_QT6) 219 VBOX_QT_PATH_LIB = $(PATH_SDK_QT6_LIB) 220 else 221 include $(KBUILD_PATH)/units/qt5.kmk 222 VBOX_QT_FWRK_VER = 5 223 VBOX_QT_PATH = $(PATH_SDK_QT5) 224 VBOX_QT_PATH_LIB = $(PATH_SDK_QT5_LIB) 225 endif 216 226 ifdef VBOX_WITH_QTGUI 217 227 INSTALLS += qt5-bin … … 219 229 qt5-bin_INST = $(INST_VIRTUALBOX)Contents/ 220 230 qt5-bin_EXEC_SOURCES = $(foreach qtmod,$(VBOX_QT_MOD_NAMES), \ 221 $( PATH_SDK_QT5_LIB)/$(qtmod).framework/Versions/5/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/5/$(qtmod))231 $(VBOX_QT_PATH_LIB)/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)) 222 232 qt5-bin_SOURCES = $(foreach qtmod,$(VBOX_QT_MOD_NAMES), \ 223 $( PATH_SDK_QT5_LIB)/$(qtmod).framework/Versions/5/Resources/Info.plist=>Frameworks/$(qtmod).framework/Versions/5/Resources/Info.plist)233 $(VBOX_QT_PATH_LIB)/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/Resources/Info.plist=>Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/Resources/Info.plist) 224 234 ifdef VBOX_WITH_QT_DSYMS 225 235 qt5-bin_SOURCES += $(foreach qtmod,$(VBOX_QT_MOD_NAMES), \ 226 $( PATH_SDK_QT5_LIB)/$(qtmod).framework.dSYM/Contents/Info.plist=>Frameworks/$(qtmod).framework.dSYM/Contents/Info.plist \227 $( PATH_SDK_QT5_LIB)/$(qtmod).framework.dSYM/Contents/Resources/DWARF/$(qtmod)=>Frameworks/$(qtmod).framework.dSYM/Contents/Resources/DWARF/$(qtmod))236 $(VBOX_QT_PATH_LIB)/$(qtmod).framework.dSYM/Contents/Info.plist=>Frameworks/$(qtmod).framework.dSYM/Contents/Info.plist \ 237 $(VBOX_QT_PATH_LIB)/$(qtmod).framework.dSYM/Contents/Resources/DWARF/$(qtmod)=>Frameworks/$(qtmod).framework.dSYM/Contents/Resources/DWARF/$(qtmod)) 228 238 endif 229 239 qt5-bin_EXEC_SOURCES += \ 230 $( PATH_SDK_QT5)/plugins/platforms/libqcocoa$(SUFF_DLL)=>plugins/platforms/libqcocoa$(SUFF_DLL) \231 $( PATH_SDK_QT5)/plugins/platforms/libqminimal$(SUFF_DLL)=>plugins/platforms/libqminimal$(SUFF_DLL) \232 $( PATH_SDK_QT5)/plugins/platforms/libqoffscreen$(SUFF_DLL)=>plugins/platforms/libqoffscreen$(SUFF_DLL) \233 $( PATH_SDK_QT5)/plugins/sqldrivers/libqsqlite$(SUFF_DLL)=>plugins/sqldrivers/libqsqlite$(SUFF_DLL) \234 $( PATH_SDK_QT5)/plugins/styles/libqmacstyle$(SUFF_DLL)=>plugins/styles/libqmacstyle$(SUFF_DLL)240 $(VBOX_QT_PATH)/plugins/platforms/libqcocoa$(SUFF_DLL)=>plugins/platforms/libqcocoa$(SUFF_DLL) \ 241 $(VBOX_QT_PATH)/plugins/platforms/libqminimal$(SUFF_DLL)=>plugins/platforms/libqminimal$(SUFF_DLL) \ 242 $(VBOX_QT_PATH)/plugins/platforms/libqoffscreen$(SUFF_DLL)=>plugins/platforms/libqoffscreen$(SUFF_DLL) \ 243 $(VBOX_QT_PATH)/plugins/sqldrivers/libqsqlite$(SUFF_DLL)=>plugins/sqldrivers/libqsqlite$(SUFF_DLL) \ 244 $(VBOX_QT_PATH)/plugins/styles/libqmacstyle$(SUFF_DLL)=>plugins/styles/libqmacstyle$(SUFF_DLL) 235 245 ifdef VBOX_WITH_QT_DSYMS 236 246 qt5-bin_SOURCES += $(foreach qtplat, libqcocoa libqminimal libqoffscreen, \ 237 $( PATH_SDK_QT5)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist \238 $( PATH_SDK_QT5)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL)=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL))247 $(VBOX_QT_PATH)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist \ 248 $(VBOX_QT_PATH)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL)=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL)) 239 249 qt5-bin_SOURCES += $(foreach qtsqldrv, libqsqlite, \ 240 $(PATH_SDK_QT5)/plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist \241 $(PATH_SDK_QT5)/plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)$(SUFF_DLL)=>plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)$(SUFF_DLL))250 $(VBOX_QT_PATH)/plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist \ 251 $(VBOX_QT_PATH)/plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)$(SUFF_DLL)=>plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)$(SUFF_DLL)) 242 252 qt5-bin_SOURCES += $(foreach qtstyl, libqmacstyle, \ 243 $( PATH_SDK_QT5)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist \244 $( PATH_SDK_QT5)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL)=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL))253 $(VBOX_QT_PATH)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist \ 254 $(VBOX_QT_PATH)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL)=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL)) 245 255 endif 246 256 qt5-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \ 247 257 Frameworks/$(qtmod).framework/Versions/Current=>5 \ 248 Frameworks/$(qtmod).framework/$(qtmod)=>Versions/ 5/$(qtmod) \249 Frameworks/$(qtmod).framework/Resources=>Versions/ 5/Resources)258 Frameworks/$(qtmod).framework/$(qtmod)=>Versions/$(VBOX_QT_FWRK_VER)/$(qtmod) \ 259 Frameworks/$(qtmod).framework/Resources=>Versions/$(VBOX_QT_FWRK_VER)/Resources) 250 260 qt5-bin_INSTALLER = $(INSTALL) $(if $(uid),-o $(uid)) $(if $(gid),-g $(gid)) $(if $(mode),-m $(mode)) $(4) -- \ 251 261 "$(1)" "$(2)" $(if-expr "$(source_type_prefix)" == "EXEC_" \ 252 262 ,$(NLTAB)install_name_tool \ 253 $(if-expr "$(suffix $2)" == "", -id "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Framework,@rpath)/$(notdir $(2)).framework/Version/ 5/$(notdir $(2))",) \263 $(if-expr "$(suffix $2)" == "", -id "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Framework,@rpath)/$(notdir $(2)).framework/Version/$(VBOX_QT_FWRK_VER)/$(notdir $(2))",) \ 254 264 $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \ 255 $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $( PATH_SDK_QT5)/, \256 -change "$(prefix)$(qtmod).framework/Versions/ 5/$(qtmod)" \257 "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/ 5/$(qtmod)" ) ) \265 $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(VBOX_QT_PATH)/, \ 266 -change "$(prefix)$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)" \ 267 "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)" ) ) \ 258 268 "$(2)",) # HACK ALERT! Using $(source_type_prefix) to detect EXEC_SOURCES. 259 269 else # win x11
Note:
See TracChangeset
for help on using the changeset viewer.

