Changeset 94050 in vbox
- Timestamp:
- Mar 2, 2022 1:41:09 AM (3 years ago)
- File:
-
- 1 edited
-
trunk/Config.kmk (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r94002 r94050 746 746 ifeq ($(KBUILD_TARGET),darwin) 747 747 VBOX_WITH_COCOA_QT = 1 748 endif 749 # Use Qt6 instead of Qt5. 750 if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.arm64) 751 VBOX_WITH_QT6 := 1 748 752 endif 749 753 # Enable the QHelp based help function in UI. … … 1201 1205 ifeq ($(KBUILD_TARGET_ARCH),arm64) 1202 1206 # No Qt yet, so no GUI, NLS or qhelp. 1203 VBOX_WITH_QTGUI :=1204 VBOX_WITH_DEBUGGER_GUI :=1205 1207 VBOX_WITH_NLS := 1206 1208 VBOX_WITH_MAIN_NLS := … … 7741 7743 TEMPLATE_VBOXQTGUIEXE_OBJCXXFLAGS += $(VBOX_GCC_WERR) 7742 7744 endif 7745 ifdef VBOX_WITH_QT6 7746 TEMPLATE_VBOXQTGUIEXE_OBJCXXFLAGS += -std=gnu++17 7747 endif 7743 7748 TEMPLATE_VBOXQTGUIEXE_OBJCXXFLAGS.x86 = $(TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.x86) 7744 7749 TEMPLATE_VBOXQTGUIEXE_OBJCXXFLAGS.amd64 = $(TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.amd64) … … 7765 7770 TEMPLATE_VBOXQTGUIEXE_PCHFLAGS.darwin += $(TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.darwin) 7766 7771 TEMPLATE_VBOXQTGUIEXE_OBJCFLAGS.darwin += $(VBOX_DARWIN_DEF_SDK_OBJCFLAGS) 7767 TEMPLATE_VBOXQTGUIEXE_OBJCXXFLAGS.darwin += $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS) $(VBOX_GCC_std) 7772 ifdef VBOX_WITH_QT6 7773 TEMPLATE_VBOXQTGUIEXE_OBJCXXFLAGS.darwin += $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS) 7774 else 7775 TEMPLATE_VBOXQTGUIEXE_OBJCXXFLAGS.darwin += $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS) $(VBOX_GCC_std) 7776 endif 7768 7777 TEMPLATE_VBOXQTGUIEXE_LDFLAGS.darwin += $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -bind_at_load -Wl,-headerpad_max_install_names 7769 7778 TEMPLATE_VBOXQTGUIEXE_LIBS +=
Note:
See TracChangeset
for help on using the changeset viewer.

