VirtualBox

Changeset 98412 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Feb 1, 2023 4:21:48 PM (23 months ago)
Author:
vboxsync
Message:

Frontends/*.kmk: Automatic scm cleanups. bugref:10348

Location:
trunk/src/VBox/Frontends
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VBoxAutostart/Makefile.kmk

    r98187 r98412  
    3434 VBoxAutostartSvc_INCS       = ../Common
    3535 VBoxAutostartSvc_SOURCES    = \
    36         VBoxAutostartCfg.cpp \
    37         VBoxAutostartStart.cpp \
    38         VBoxAutostartStop.cpp \
    39         VBoxAutostartUtils.cpp \
    40         VBoxAutostart-win.cpp \
    41         ../Common/PasswordInput.cpp
     36        VBoxAutostartCfg.cpp \
     37        VBoxAutostartStart.cpp \
     38        VBoxAutostartStop.cpp \
     39        VBoxAutostartUtils.cpp \
     40        VBoxAutostart-win.cpp \
     41        ../Common/PasswordInput.cpp
    4242 VBoxAutostartSvc_LIBS.win += Secur32.lib
    4343else
    … …  
    4545 VBoxAutostart_TEMPLATE   = VBoxMainClientExe
    4646 VBoxAutostart_SOURCES    = \
    47         VBoxAutostartCfg.cpp \
    48         VBoxAutostartStart.cpp \
    49         VBoxAutostartStop.cpp \
    50         VBoxAutostartUtils.cpp \
    51         VBoxAutostart-posix.cpp
     47        VBoxAutostartCfg.cpp \
     48        VBoxAutostartStart.cpp \
     49        VBoxAutostartStop.cpp \
     50        VBoxAutostartUtils.cpp \
     51        VBoxAutostart-posix.cpp
    5252endif
    5353

  • trunk/src/VBox/Frontends/VBoxBalloonCtrl/Makefile.kmk

    r98187 r98412  
    3939VBoxBalloonCtrl_DEFS.win   = _WIN32_WINNT=0x0500
    4040VBoxBalloonCtrl_SOURCES    = \
    41         VBoxWatchdog.cpp      \
     41        VBoxWatchdog.cpp \
    4242        VBoxWatchdogUtils.cpp \
    4343        VBoxModAPIMonitor.cpp \

  • trunk/src/VBox/Frontends/VBoxBugReport/Makefile.kmk

    r98187 r98412  
    3434VBoxBugReport_TEMPLATE   = VBoxMainClientExe
    3535ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    36 # VBoxBugReport_DEFS      = VBOX_WATCHDOG_GLOBAL_PERFCOL VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"
     36 # VBoxBugReport_DEFS      = VBOX_WATCHDOG_GLOBAL_PERFCOL VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"
    3737else
    38 # VBoxBugReport_DEFS      = VBOX_WATCHDOG_GLOBAL_PERFCOL VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
     38 # VBoxBugReport_DEFS      = VBOX_WATCHDOG_GLOBAL_PERFCOL VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
    3939endif
    4040VBoxBugReport_DEFS.win   = _WIN32_WINNT=0x0501 PSAPI_VERSION=1

  • trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk

    r98188 r98412  
    3535#
    3636ifdef VBOX_WITH_HARDENING
    37 PROGRAMS += VBoxHeadlessHardened
    38 VBoxHeadlessHardened_TEMPLATE = VBoxR3HardenedExe
    39 VBoxHeadlessHardened_DEFS    += $(if $(VBOX_WITH_DRIVERLESS_NEM_FALLBACK),VBOX_WITH_DRIVERLESS_NEM_FALLBACK,)
    40 VBoxHeadlessHardened_SOURCES = VBoxHeadlessHardened.cpp
    41 VBoxHeadlessHardened_NAME = VBoxHeadless
    42 $(call VBOX_SET_VER_INFO_DLL,VBoxHeadlessHardened,VirtualBox Headless Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
     37 PROGRAMS += VBoxHeadlessHardened
     38 VBoxHeadlessHardened_TEMPLATE = VBoxR3HardenedExe
     39 VBoxHeadlessHardened_DEFS   += $(if $(VBOX_WITH_DRIVERLESS_NEM_FALLBACK),VBOX_WITH_DRIVERLESS_NEM_FALLBACK,)
     40 VBoxHeadlessHardened_SOURCES = VBoxHeadlessHardened.cpp
     41 VBoxHeadlessHardened_NAME = VBoxHeadless
     42 $(call VBOX_SET_VER_INFO_DLL,VBoxHeadlessHardened,VirtualBox Headless Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
    4343endif
    4444
    … …  
    4848#
    4949ifdef VBOX_WITH_HARDENING
    50 DLLS     += VBoxHeadless
     50 DLLS    += VBoxHeadless
    5151else
    52 PROGRAMS += VBoxHeadless
     52 PROGRAMS += VBoxHeadless
    5353endif
    5454VBoxHeadless_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBoxMainClientDll,VBoxMainClientExe)
    … …  
    6767endif
    6868ifdef VBOX_WITH_HARDENING
    69 $(call VBOX_SET_VER_INFO_DLL,VBoxHeadless,VirtualBox Headless Frontend (dll),$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
     69 $(call VBOX_SET_VER_INFO_DLL,VBoxHeadless,VirtualBox Headless Frontend (dll),$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
    7070else
    71 $(call VBOX_SET_VER_INFO_EXE,VBoxHeadless,VirtualBox Headless Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
     71 $(call VBOX_SET_VER_INFO_EXE,VBoxHeadless,VirtualBox Headless Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
    7272endif
    7373

  • trunk/src/VBox/Frontends/VBoxIntnetPcap/Makefile.kmk

    r98128 r98412  
    3232VBoxIntnetPcap_TEMPLATE := VBoxR3Exe
    3333VBoxIntnetPcap_DEFS     := \
    34         $(if $(VBOX_WITH_INTNET_SERVICE_IN_R3),VBOX_WITH_INTNET_SERVICE_IN_R3,)
     34        $(if $(VBOX_WITH_INTNET_SERVICE_IN_R3),VBOX_WITH_INTNET_SERVICE_IN_R3,)
    3535VBoxIntnetPcap_INCS     := \
    3636        ../../NetworkServices/NetLib \

  • trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

    r98187 r98412  
    3434## @todo r=andy Sort this stuff alphabetically!
    3535VBOX_COMMON_VBOXMANAGE_DEFS = \
    36         $(if $(VBOX_WITH_AHCI), VBOX_WITH_AHCI) \
    37         $(if $(VBOX_WITH_COPYTOGUEST),VBOX_WITH_COPYTOGUEST) \
    38         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
    39         $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL) \
    40         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS) \
    41         $(if $(VBOX_WITH_HEADLESS), VBOX_WITH_HEADLESS) \
    42         $(if $(VBOX_WITH_HGCM), VBOX_WITH_HGCM) \
    43         $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \
    44         $(if $(VBOX_WITH_NETFLT), VBOX_WITH_NETFLT) \
    45         $(if-expr defined(VBOX_WITH_VMNET) && "$(KBUILD_TARGET)"=="darwin",VBOX_WITH_VMNET,) \
    46         $(if $(VBOX_WITH_CLOUD_NET), VBOX_WITH_CLOUD_NET) \
     36        $(if $(VBOX_WITH_AHCI), VBOX_WITH_AHCI) \
     37        $(if $(VBOX_WITH_COPYTOGUEST),VBOX_WITH_COPYTOGUEST) \
     38        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
     39        $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL) \
     40        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS) \
     41        $(if $(VBOX_WITH_HEADLESS), VBOX_WITH_HEADLESS) \
     42        $(if $(VBOX_WITH_HGCM), VBOX_WITH_HGCM) \
     43        $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \
     44        $(if $(VBOX_WITH_NETFLT), VBOX_WITH_NETFLT) \
     45        $(if-expr defined(VBOX_WITH_VMNET) && "$(KBUILD_TARGET)"=="darwin",VBOX_WITH_VMNET,) \
     46        $(if $(VBOX_WITH_CLOUD_NET), VBOX_WITH_CLOUD_NET) \
    4747        $(if $(VBOX_WITH_AUDIO_OSS), VBOX_WITH_AUDIO_OSS) \
    4848        $(if $(VBOX_WITH_AUDIO_ALSA), VBOX_WITH_AUDIO_ALSA) \
    49         $(if $(VBOX_WITH_AUDIO_PULSE),VBOX_WITH_AUDIO_PULSE) \
    50         $(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \
    51         $(if $(VBOX_WITH_VBOXSDL), VBOX_WITH_VBOXSDL) \
    52         $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL) \
    53         $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \
     49        $(if $(VBOX_WITH_AUDIO_PULSE),VBOX_WITH_AUDIO_PULSE) \
     50        $(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \
     51        $(if $(VBOX_WITH_VBOXSDL), VBOX_WITH_VBOXSDL) \
     52        $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL) \
     53        $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \
    5454        $(if $(VBOX_WITH_VIRTIO_NET_1_0),VBOX_WITH_VIRTIO_NET_1_0) \
    55         $(if $(VBOX_WITH_USB_CARDREADER),VBOX_WITH_USB_CARDREADER) \
    56         $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH) \
    57         $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING) \
     55        $(if $(VBOX_WITH_USB_CARDREADER),VBOX_WITH_USB_CARDREADER) \
     56        $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH) \
     57        $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING) \
    5858        $(if $(VBOX_WITH_AUDIO_RECORDING),VBOX_WITH_AUDIO_RECORDING) \
    59         $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE) \
    60         $(if $(VBOX_WITH_SHARED_CLIPBOARD),VBOX_WITH_SHARED_CLIPBOARD) \
    61         $(if $(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS),VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS) \
    62         $(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD) \
    63         $(if $(VBOX_WITH_IOMMU_INTEL),VBOX_WITH_IOMMU_INTEL) \
     59        $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE) \
     60        $(if $(VBOX_WITH_SHARED_CLIPBOARD),VBOX_WITH_SHARED_CLIPBOARD) \
     61        $(if $(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS),VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS) \
     62        $(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD) \
     63        $(if $(VBOX_WITH_IOMMU_INTEL),VBOX_WITH_IOMMU_INTEL) \
    6464        $(if $(VBOX_WITH_UPDATE_AGENT), VBOX_WITH_UPDATE_AGENT) \
    65         $(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA) \
     65        $(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA) \
    6666        $(if $(VBOX_WITH_MAIN_NLS),VBOX_WITH_MAIN_NLS) \
    67         $(if $(VBOX_WITH_TPM),VBOX_WITH_TPM) \
    68         $(if $(VBOX_WITH_FULL_VM_ENCRYPTION),VBOX_WITH_FULL_VM_ENCRYPTION)
     67        $(if $(VBOX_WITH_TPM),VBOX_WITH_TPM) \
     68        $(if $(VBOX_WITH_FULL_VM_ENCRYPTION),VBOX_WITH_FULL_VM_ENCRYPTION)
    6969
    7070
    … …  
    8181 VBoxManage_SOURCES    = \
    8282        VBoxManage.cpp \
    83         VBoxManageUtils.cpp \
     83        VBoxManageUtils.cpp \
    8484        VBoxInternalManage.cpp \
    8585        VBoxManageAppliance.cpp \
    … …  
    9393        $(if $(VBOX_WITH_GUEST_PROPS),VBoxManageGuestProp.cpp) \
    9494        VBoxManageHelp.cpp \
    95         $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp.cpp \
    96         $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_en_US.cpp \
     95        $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp.cpp \
     96        $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_en_US.cpp \
    9797        VBoxManageHostonly.cpp \
    9898        VBoxManageInfo.cpp \
    … …  
    104104        VBoxManageSnapshot.cpp \
    105105        VBoxManageStorageController.cpp \
    106          $(if $(VBOX_WITH_UPDATE_AGENT),VBoxManageUpdateCheck.cpp) \
     106        $(if $(VBOX_WITH_UPDATE_AGENT),VBoxManageUpdateCheck.cpp) \
    107107        VBoxManageUSB.cpp \
    108108        $(if $(VBOX_WITH_NAT_SERVICE),VBoxManageNATNetwork.cpp,) \
    … …  
    115115 VBoxManage_LIBS      += $(LIB_DDU)
    116116
    117 ifdef VBOX_WITH_VBOXMANAGE_NLS
    118  VBOX_PATH_VBOXMANAGE_SRC := $(PATH_SUB_CURRENT)
    119  include $(PATH_SUB_CURRENT)/nls/ApprovedLanguages.kmk
    120 
    121  VBoxManage_DEFS      += VBOX_WITH_VBOXMANAGE_NLS
    122  VBoxManage_INCS      += \
    123         $(PATH_ROOT)/src/VBox/Main/include
    124  VBoxManage_SOURCES   += \
    125         $(PATH_ROOT)/src/VBox/Main/src-all/VirtualBoxTranslator.cpp \
    126         $(PATH_ROOT)/src/VBox/Main/src-all/QMTranslatorImpl.cpp \
    127         $(PATH_ROOT)/src/VBox/Main/src-all/GlobalStatusConversion.cpp \
    128 
    129 #       $(addsuffix /VBoxManageBuiltInHelp.cpp,$(addprefix $(VBoxManage_0_OUTDIR)/,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES)))
    130 #VBoxManage_INTERMEDIATES += \
    131 #       $(addsuffix /VBoxManageBuiltInHelp.h,$(addprefix $(VBoxManage_0_OUTDIR)/,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES)))
    132 
    133 # define qt5 tools for translation
    134  USES += qt5
    135 
    136  PROGRAMS += VBoxManageNls
    137  VBoxManageNls_TEMPLATE = VBoxNLS
    138  VBoxManageNls_QT_TRANSLATIONS = $(addsuffix .ts,$(addprefix $(VBOX_PATH_VBOXMANAGE_SRC)/nls/VBoxManageNls_,$(VBOX_APPROVED_VBOXMANAGE_LANGUAGES)))
    139  VBoxManageNls_VBOX_ALL_NLS_SOURCES = $(wildcard \
    140         $(VBOX_PATH_VBOXMANAGE_SRC)/*.h\
    141         $(VBOX_PATH_VBOXMANAGE_SRC)/*.cpp )
    142 
    143  updatenls:: makeallnls $(VBOX_PATH_VBOXMANAGE_SRC)/nls/VBoxManageNls_en.ts
    144 
    145  makeallnls:: $(VBoxManageNls_VBOX_ALL_NLS_SOURCES)
     117 ifdef VBOX_WITH_VBOXMANAGE_NLS
     118  VBOX_PATH_VBOXMANAGE_SRC := $(PATH_SUB_CURRENT)
     119  include $(PATH_SUB_CURRENT)/nls/ApprovedLanguages.kmk
     120
     121  VBoxManage_DEFS     += VBOX_WITH_VBOXMANAGE_NLS
     122  VBoxManage_INCS     += \
     123        $(PATH_ROOT)/src/VBox/Main/include
     124  VBoxManage_SOURCES  += \
     125        $(PATH_ROOT)/src/VBox/Main/src-all/VirtualBoxTranslator.cpp \
     126        $(PATH_ROOT)/src/VBox/Main/src-all/QMTranslatorImpl.cpp \
     127        $(PATH_ROOT)/src/VBox/Main/src-all/GlobalStatusConversion.cpp
     128
     129  #     $(addsuffix /VBoxManageBuiltInHelp.cpp,$(addprefix $(VBoxManage_0_OUTDIR)/,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES)))
     130  #VBoxManage_INTERMEDIATES += \
     131  #     $(addsuffix /VBoxManageBuiltInHelp.h,$(addprefix $(VBoxManage_0_OUTDIR)/,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES)))
     132
     133  # define qt5 tools for translation
     134  USES += qt5
     135
     136  PROGRAMS += VBoxManageNls
     137  VBoxManageNls_TEMPLATE = VBoxNLS
     138  VBoxManageNls_QT_TRANSLATIONS = $(addsuffix .ts,$(addprefix $(VBOX_PATH_VBOXMANAGE_SRC)/nls/VBoxManageNls_,$(VBOX_APPROVED_VBOXMANAGE_LANGUAGES)))
     139  VBoxManageNls_VBOX_ALL_NLS_SOURCES = $(wildcard \
     140        $(VBOX_PATH_VBOXMANAGE_SRC)/*.h \
     141        $(VBOX_PATH_VBOXMANAGE_SRC)/*.cpp )
     142
     143  updatenls:: makeallnls $(VBOX_PATH_VBOXMANAGE_SRC)/nls/VBoxManageNls_en.ts
     144
     145  makeallnls:: $(VBoxManageNls_VBOX_ALL_NLS_SOURCES)
    146146        $(call MSG_L1,lupdate all languages (nls/*.ts))
    147147        $(QUIET)$(TOOL_QT5_LUPDATE) \
    … …  
    151151                $(VBOX_PATH_VBOXMANAGE_SRC)/nls/VBoxManageNls_xx_YY.ts
    152152
    153 # fake-main-nls:
    154 #       $(foreach file, $(VBoxManageNls_QT_TRANSLATIONS) \
    155 #       ,$(NLTAB)$(SED) -i \
    156 #               -e '/<source>.*<\/source>/h' \
    157 #               -e '/<source>.*<\/source>/p' \
    158 #               -e '/<translation type="unfinished"><\/translation>/{' \
    159 #                       -e 'x' \
    160 #                       -e 's/<source>\(.*\)<\/source>/<translation type="unfinished">$(notdir $(file)): \1<\/translation>/' \
    161 #               -e '}' \
    162 #               $(file) )
    163 
    164 
    165 # Create the English translation file. This is something special cause it will
    166 # contain the plural forms only.
    167  $(VBOX_PATH_VBOXMANAGE_SRC)/nls/VBoxManageNls_en.ts: $(VBoxManageNls_VBOX_ALL_NLS_SOURCES)
     153  # fake-main-nls:
     154  #     $(foreach file, $(VBoxManageNls_QT_TRANSLATIONS) \
     155  #     ,$(NLTAB)$(SED) -i \
     156  #             -e '/<source>.*<\/source>/h' \
     157  #             -e '/<source>.*<\/source>/p' \
     158  #             -e '/<translation type="unfinished"><\/translation>/{' \
     159  #                     -e 'x' \
     160  #                     -e 's/<source>\(.*\)<\/source>/<translation type="unfinished">$(notdir $(file)): \1<\/translation>/' \
     161  #             -e '}' \
     162  #             $(file) )
     163
     164
     165  # Create the English translation file. This is something special cause it will
     166  # contain the plural forms only.
     167  $(VBOX_PATH_VBOXMANAGE_SRC)/nls/VBoxManageNls_en.ts: $(VBoxManageNls_VBOX_ALL_NLS_SOURCES)
    168168        $(call MSG_L1,lupdate $@)
    169169        $(QUIET)$(TOOL_QT5_LUPDATE) \
    … …  
    179179                "$@"
    180180
    181 endif # VBOX_WITH_VBOXMANAGE_NLS
     181 endif # VBOX_WITH_VBOXMANAGE_NLS
    182182
    183183
    … …  
    195195 # that version 4.3.2 or later has this bug definitely fixed.
    196196 VBoxManage_CXXFLAGS.release += \
    197         $(if $(VBOX_GCC_VERSION_CXX),$(if-expr $(VBOX_GCC_VERSION_CXX) < 40300 || $(VBOX_GCC_VERSION_CXX) > 40301,,--param max-fields-for-field-sensitive=0),)
     197        $(if $(VBOX_GCC_VERSION_CXX),$(if-expr $(VBOX_GCC_VERSION_CXX) < 40300 || $(VBOX_GCC_VERSION_CXX) > 40301,,--param max-fields-for-field-sensitive=0),)
    198198 VBoxManageHelp_CXXFLAGS.release = $(VBoxManage_CXXFLAGS.release)
    199199endif
    … …  
    232232# @param    2    language code.
    233233define def_vbox_man_generate_cpp_help
    234 ifneq ($(2),en_US)
    235 VBOX_DOCBOOK_REFENTRY_TO_C_HELP_$(2) = $(VBOX_PATH_MANUAL_SRC)/$(2)/docbook-refentry-to-C-help.xsl
    236 else
    237 VBOX_DOCBOOK_REFENTRY_TO_C_HELP_$(2) = $(VBOX_DOCBOOK_REFENTRY_TO_C_HELP)
    238 endif
    239 $$(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_$(2).cpp.ts \
    240 +| $$(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_$(2).cpp: \
    241                 $$(VBOX_DOCBOOK_REFENTRY_TO_C_HELP_$(2)) \
    242                 $$(VBOX_DOCBOOK_REFENTRY_TO_C_HELP) \
    243                 $$(addprefix $(1)/,$$(filter man_VBoxManage-%,$$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
    244                 $$(VBOX_XML_CATALOG) $$(VBOX_XML_CATALOG_DOCBOOK) $$(MAKEFILE) | $$$$(dir $$$$@)
     234 ifneq ($(2),en_US)
     235  VBOX_DOCBOOK_REFENTRY_TO_C_HELP_$(2) = $(VBOX_PATH_MANUAL_SRC)/$(2)/docbook-refentry-to-C-help.xsl
     236 else
     237  VBOX_DOCBOOK_REFENTRY_TO_C_HELP_$(2) = $(VBOX_DOCBOOK_REFENTRY_TO_C_HELP)
     238 endif
     239 $$(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_$(2).cpp.ts \
     240 +| $$(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_$(2).cpp: \
     241                $$(VBOX_DOCBOOK_REFENTRY_TO_C_HELP_$(2)) \
     242                $$(VBOX_DOCBOOK_REFENTRY_TO_C_HELP) \
     243                $$(addprefix $(1)/,$$(filter man_VBoxManage-%,$$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
     244                $$(VBOX_XML_CATALOG) $$(VBOX_XML_CATALOG_DOCBOOK) $$(MAKEFILE) | $$$$(dir $$$$@)
    245245        $$(call MSG_TOOL,xsltproc $$(notdir $$(firstword $$(filter %.xsl,$$^))),,$$(filter %.xml,$$^),$$(patsubst %.ts,%,$$@))
    246246        $$(QUIET)$$(APPEND) -tn "$$@" \
    … …  
    375375ifdef VBOX_WITH_VBOXMANAGE_NLS
    376376 VBoxManage_BLDDIRS += \
    377         $(addprefix $(VBoxManage_0_OUTDIR)/,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES))
     377        $(addprefix $(VBoxManage_0_OUTDIR)/,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES))
    378378
    379379 VBoxManage_SOURCES += \
    380380        $(foreach lang, $(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES) \
    381         , $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_$(lang).cpp)
     381        , $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_$(lang).cpp)
    382382
    383383 VBoxManage_CLEAN += \
    384         $(foreach lang,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES), \
    385         $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/, \
    386             $(VBOX_XML_XREF_TO_TEXT) \
    387             $(VBOX_XML_XREF_TO_TEXT).cat \
    388         )) \
    389         $(addsuffix .cpp,$(addprefix $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES))) \
    390         $(addsuffix .cpp.ts,$(addprefix $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES))) \
    391         $(foreach file, $(filter man_VBoxManage-%,$(VBOX_MANUAL_XML_REFENTRY_FILES)) \
    392         , $(addsuffix /$(file),$(addprefix $(VBoxManage_0_OUTDIR)/,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES))))
     384        $(foreach lang,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES), \
     385        $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/, \
     386        $(VBOX_XML_XREF_TO_TEXT) \
     387        $(VBOX_XML_XREF_TO_TEXT).cat \
     388        )) \
     389        $(addsuffix .cpp,$(addprefix $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES))) \
     390        $(addsuffix .cpp.ts,$(addprefix $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES))) \
     391        $(foreach file, $(filter man_VBoxManage-%,$(VBOX_MANUAL_XML_REFENTRY_FILES)) \
     392        , $(addsuffix /$(file),$(addprefix $(VBoxManage_0_OUTDIR)/,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES))))
    393393
    394394 # Preprocess the xml files, applying remarks.

  • trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk

    r98361 r98412  
    3131
    3232
    33 ifdef VBOX_WITH_HARDENING
    34  #
    35  # Hardened VBoxSDL
    36  #
    37  PROGRAMS += VBoxSDLHardened
    38  VBoxSDLHardened_TEMPLATE = VBoxR3HardenedExe
    39  VBoxSDLHardened_SOURCES = VBoxSDLHardened.cpp
    40  VBoxSDLHardened_NAME = VBoxSDL
    41  $(call VBOX_SET_VER_INFO_EXE,VBoxSDLHardened,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
    42 endif
     33 ifdef VBOX_WITH_HARDENING
     34  #
     35  # Hardened VBoxSDL
     36  #
     37  PROGRAMS += VBoxSDLHardened
     38  VBoxSDLHardened_TEMPLATE = VBoxR3HardenedExe
     39  VBoxSDLHardened_SOURCES = VBoxSDLHardened.cpp
     40  VBoxSDLHardened_NAME = VBoxSDL
     41  $(call VBOX_SET_VER_INFO_EXE,VBoxSDLHardened,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
     42 endif
    4343
    4444
    45 #
    46 # VBoxSDL
    47 #
    48 ifdef VBOX_WITH_HARDENING
    49  DLLS += VBoxSDL
    50 else
    51  PROGRAMS += VBoxSDL
    52 endif
    53 VBoxSDL_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBoxMainClientDll,VBoxMainClientExe)
    54 VBoxSDL_SDKS       = LIBSDL2
    55 VBoxSDL_SOURCES    = \
    56         VBoxSDL.cpp \
    57         Framebuffer.cpp \
    58         Helper.cpp \
    59         ../Common/PasswordInput.cpp
    60 VBoxSDL_SOURCES.darwin = \
    61         VBoxSDLMain-darwin.m \
    62         Framebuffer-darwin.m
     45 #
     46 # VBoxSDL
     47 #
     48 ifdef VBOX_WITH_HARDENING
     49  DLLS += VBoxSDL
     50 else
     51  PROGRAMS += VBoxSDL
     52 endif
     53 VBoxSDL_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBoxMainClientDll,VBoxMainClientExe)
     54 VBoxSDL_SDKS      = LIBSDL2
     55 VBoxSDL_SOURCES   = \
     56        VBoxSDL.cpp \
     57        Framebuffer.cpp \
     58        Helper.cpp \
     59        ../Common/PasswordInput.cpp
     60 VBoxSDL_SOURCES.darwin = \
     61        VBoxSDLMain-darwin.m \
     62        Framebuffer-darwin.m
    6363
    64 VBoxSDL_DEFS       =
    65 VBoxSDL_DEFS.freebsd = VBOXSDL_WITH_X11
    66 VBoxSDL_DEFS.linux = _GNU_SOURCE VBOXSDL_WITH_X11
    67 VBoxSDL_DEFS.solaris = VBOXSDL_WITH_X11
    68 ifdef VBOX_OPENGL
    69  #VBoxSDL_DEFS.linux += VBOX_OPENGL
    70 endif
    71 VBoxSDL_DEFS.win.x86 = _WIN32_WINNT=0x0500
    72 VBoxSDL_DEFS.win.amd64 = _WIN32_WINNT=0x0510
     64 VBoxSDL_DEFS      =
     65 VBoxSDL_DEFS.freebsd = VBOXSDL_WITH_X11
     66 VBoxSDL_DEFS.linux = _GNU_SOURCE VBOXSDL_WITH_X11
     67 VBoxSDL_DEFS.solaris = VBOXSDL_WITH_X11
     68 ifdef VBOX_OPENGL
     69  #VBoxSDL_DEFS.linux += VBOX_OPENGL
     70 endif
     71 VBoxSDL_DEFS.win.x86 = _WIN32_WINNT=0x0500
     72 VBoxSDL_DEFS.win.amd64 = _WIN32_WINNT=0x0510
    7373
    74 VBoxSDL_INCS = \
    75         $(VBoxSDL_0_OUTDIR) \
    76         $(VBOX_GRAPHICS_INCS) \
    77         ../Common
    78 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
    79 VBoxSDL_INCS += \
    80         $(VBOX_XCURSOR_INCS)
    81 endif
    82 ifn1of ($(KBUILD_TARGET), solaris) # Probably wrong with SDL2
    83 VBoxSDL_LIBS = \
    84         $(LIB_SDK_LIBSDL2_SDLMAIN)
    85 endif
    86 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
    87 VBoxSDL_LIBS += \
    88         $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) \
    89         $(VBOX_XCURSOR_LIBS) \
    90         X11
    91 VBoxSDL_LIBPATH = \
    92         $(VBOX_LIBPATH_X11)
    93 endif
    94 ifdef VBOX_OPENGL
    95  #VBoxSDL_LIBS.linux += GL
    96 endif
     74 VBoxSDL_INCS = \
     75        $(VBoxSDL_0_OUTDIR) \
     76        $(VBOX_GRAPHICS_INCS) \
     77        ../Common
     78 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
     79  VBoxSDL_INCS += \
     80        $(VBOX_XCURSOR_INCS)
     81 endif
     82 ifn1of ($(KBUILD_TARGET), solaris) # Probably wrong with SDL2
     83  VBoxSDL_LIBS = \
     84        $(LIB_SDK_LIBSDL2_SDLMAIN)
     85 endif
     86 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
     87  VBoxSDL_LIBS += \
     88        $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) \
     89        $(VBOX_XCURSOR_LIBS) \
     90        X11
     91  VBoxSDL_LIBPATH = \
     92        $(VBOX_LIBPATH_X11)
     93 endif
     94 ifdef VBOX_OPENGL
     95  #VBoxSDL_LIBS.linux += GL
     96 endif
    9797
    98 VBoxSDL_LDFLAGS.darwin = \
    99         -framework Foundation -framework AppKit
    100 VBoxSDL_LDFLAGS.win = -SubSystem:Windows
     98 VBoxSDL_LDFLAGS.darwin = \
     99        -framework Foundation -framework AppKit
     100 VBoxSDL_LDFLAGS.win = -SubSystem:Windows
    101101
    102 VBoxSDL_CLEAN = $(VBoxSDL_0_OUTDIR)/Ico64x01.h
    103 VBoxSDL_INTERMEDIATES = $(VBoxSDL_0_OUTDIR)/Ico64x01.h
     102 VBoxSDL_CLEAN = $(VBoxSDL_0_OUTDIR)/Ico64x01.h
     103 VBoxSDL_INTERMEDIATES = $(VBoxSDL_0_OUTDIR)/Ico64x01.h
    104104
    105105
    106 # Convert the pnm-file to a byte array.
    107 $$(VBoxSDL_0_OUTDIR)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxSDL/ico64x01.pnm $(VBOX_BIN2C) | $$(dir $$@)
     106 # Convert the pnm-file to a byte array.
     107 $$(VBoxSDL_0_OUTDIR)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxSDL/ico64x01.pnm $(VBOX_BIN2C) | $$(dir $$@)
    108108        $(call MSG_TOOL,bin2c,VBoxSDL,$<,$@)
    109109        $(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@
    110110
    111 ifdef VBOX_WITH_HARDENING
    112 $(call VBOX_SET_VER_INFO_DLL,VBoxSDL,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
    113 else
    114 $(call VBOX_SET_VER_INFO_EXE,VBoxSDL,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
    115 endif
     111 ifdef VBOX_WITH_HARDENING
     112  $(call VBOX_SET_VER_INFO_DLL,VBoxSDL,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
     113 else
     114  $(call VBOX_SET_VER_INFO_EXE,VBoxSDL,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
     115 endif
    116116
    117117
    118 #
    119 # tstSDL
    120 #
    121 if 0
    122 PROGRAMS += tstSDL
    123 tstSDL_TEMPLATE = VBoxR3TstExe
    124 tstSDL_SDKS = LIBSDL2
    125 tstSDL_INST = $(INST_TESTCASE)
    126 tstSDL_SOURCES = \
    127         VBoxSDLTest.cpp
    128 tstSDL_SOURCES.darwin = \
    129         VBoxSDLMain-darwin.m
    130 tstSDL_DEFS = IN_RING3 IN_RT_R3 _GNU_SOURCE
    131 tstSDL_DEFS.win.x86 = _WIN32_WINNT=0x0500
    132 ifdef VBOX_OPENGL
    133 tstSDL_DEFS.linux = VBOX_OPENGL
    134 endif
     118 #
     119 # tstSDL
     120 #
     121 if 0
     122  PROGRAMS += tstSDL
     123  tstSDL_TEMPLATE = VBoxR3TstExe
     124  tstSDL_SDKS = LIBSDL2
     125  tstSDL_INST = $(INST_TESTCASE)
     126  tstSDL_SOURCES = \
     127        VBoxSDLTest.cpp
     128  tstSDL_SOURCES.darwin = \
     129        VBoxSDLMain-darwin.m
     130  tstSDL_DEFS = IN_RING3 IN_RT_R3 _GNU_SOURCE
     131  tstSDL_DEFS.win.x86 = _WIN32_WINNT=0x0500
     132  ifdef VBOX_OPENGL
     133   tstSDL_DEFS.linux = VBOX_OPENGL
     134  endif
    135135
    136136
    137 tstSDL_LIBS = \
    138         $(LIB_RUNTIME)
    139 ifn1of ($(KBUILD_TARGET), solaris)
    140 tstSDL_LIBS += \
    141         $(LIB_SDK_LIBSDL2_SDLMAIN)
    142 endif
     137  tstSDL_LIBS = \
     138        $(LIB_RUNTIME)
     139  ifn1of ($(KBUILD_TARGET), solaris)
     140   tstSDL_LIBS += \
     141        $(LIB_SDK_LIBSDL2_SDLMAIN)
     142  endif
    143143
    144 ifdef VBOX_OPENGL
    145 tstSDL_LIBS.linux += GL
    146 endif
    147 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
    148 tstSDL_LIBPATH = \
    149         $(VBOX_LIBPATH_X11)
    150 endif
     144  ifdef VBOX_OPENGL
     145   tstSDL_LIBS.linux += GL
     146  endif
     147  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
     148   tstSDL_LIBPATH = \
     149        $(VBOX_LIBPATH_X11)
     150  endif
    151151
    152 tstSDL_LDFLAGS.darwin = \
    153         -framework Foundation -framework AppKit
    154 endif
    155 ## @todo What was this stuff doing here? The exception config is saying two different things, and why just -O for release builds?
    156 #tstSDL_CXXFLAGS.win = \
    157 #       -EHsc
    158 #tstSDL_CXXFLAGS.linux = \
    159 #       -DNDEBUG -DTRIMMED -O -Wall -fno-rtti -fno-exceptions \
    160 #       -Wno-non-virtual-dtor -Wno-long-long -fshort-wchar -pthread -pipe
    161 # Is this what's intended? Why -fshort-wchar?
    162 tstSDL_DEFS.linux = NDEBUG TRIMMED
    163 tstSDL_CXXFLAGS.linux = -O -Wall -Wno-non-virtual-dtor -Wno-long-long -fshort-wchar
     152  tstSDL_LDFLAGS.darwin = \
     153        -framework Foundation -framework AppKit
     154 endif
     155 ## @todo What was this stuff doing here? The exception config is saying two different things, and why just -O for release builds?
     156 #tstSDL_CXXFLAGS.win = \
     157 #      -EHsc
     158 #tstSDL_CXXFLAGS.linux = \
     159 #      -DNDEBUG -DTRIMMED -O -Wall -fno-rtti -fno-exceptions \
     160 #      -Wno-non-virtual-dtor -Wno-long-long -fshort-wchar -pthread -pipe
     161 # Is this what's intended? Why -fshort-wchar?
     162 tstSDL_DEFS.linux = NDEBUG TRIMMED
     163 tstSDL_CXXFLAGS.linux = -O -Wall -Wno-non-virtual-dtor -Wno-long-long -fshort-wchar
    164164
    165165

  • trunk/src/VBox/Frontends/VBoxShell/Makefile.kmk

    r98103 r98412  
    3333VBoxShell_SOURCES = \
    3434        vboxshell.py=>glue/python/sample/vboxshell.py \
    35         vboxinfo.vbs=>mscom/vbs/sample/vboxinfo.vbs  \
    36         vboxinfo.vb=>mscom/vb/sample/vboxinfo.vb
     35        vboxinfo.vbs=>mscom/vbs/sample/vboxinfo.vbs \
     36        vboxinfo.vb=>mscom/vb/sample/vboxinfo.vb
    3737
    3838

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r98215 r98412  
    6868#
    6969ifdef VBOX_WITH_HARDENING
    70 VirtualBoxHardenedVM_TEMPLATE = VBoxR3HardenedExe
    71 VirtualBoxHardenedVM_INST.darwin = $(INST_VIRTUALBOX)Contents/Resources/VirtualBoxVM.app/Contents/MacOS/
    72 VirtualBoxHardenedVM_NAME = VirtualBoxVM
    73 VirtualBoxHardenedVM_DEFS += $(if $(VBOX_WITH_DRIVERLESS_NEM_FALLBACK),VBOX_WITH_DRIVERLESS_NEM_FALLBACK,)
    74 VirtualBoxHardenedVM_SOURCES = src/hardenedmain.cpp
    75 VirtualBoxHardenedVM_LDFLAGS.win = /SUBSYSTEM:$(if-expr "$(KBUILD_TYPE)" != "release",console,windows)
    76 $(call VBOX_SET_VER_INFO_EXE,VirtualBoxHardenedVM,VirtualBox Virtual Machine,$(VBOX_WINDOWS_ICON_FILE))
     70 VirtualBoxHardenedVM_TEMPLATE = VBoxR3HardenedExe
     71 VirtualBoxHardenedVM_INST.darwin = $(INST_VIRTUALBOX)Contents/Resources/VirtualBoxVM.app/Contents/MacOS/
     72 VirtualBoxHardenedVM_NAME = VirtualBoxVM
     73 VirtualBoxHardenedVM_DEFS += $(if $(VBOX_WITH_DRIVERLESS_NEM_FALLBACK),VBOX_WITH_DRIVERLESS_NEM_FALLBACK,)
     74 VirtualBoxHardenedVM_SOURCES = src/hardenedmain.cpp
     75 VirtualBoxHardenedVM_LDFLAGS.win = /SUBSYSTEM:$(if-expr "$(KBUILD_TYPE)" != "release",console,windows)
     76 $(call VBOX_SET_VER_INFO_EXE,VirtualBoxHardenedVM,VirtualBox Virtual Machine,$(VBOX_WINDOWS_ICON_FILE))
    7777endif
    7878
    … …  
    9999#
    100100ifndef VBOX_OSE
    101 VBOX_WITH_UPDATE_REQUEST := 1
     101 VBOX_WITH_UPDATE_REQUEST := 1
    102102endif
    103103
    … …  
    154154 VBOX_GUI_WITH_NETWORK_MANAGER := 1
    155155endif
    156 if  "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_EXTRADATA_MANAGER_UI)
     156if "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_EXTRADATA_MANAGER_UI)
    157157 VirtualBox_DEFS          += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    158158endif
    … …  
    168168VirtualBoxVM_NAME           = VirtualBoxVM
    169169ifndef VBOX_WITH_HARDENING
    170 VirtualBoxVM_INST.darwin    = $(INST_VIRTUALBOX)Contents/Resources/VirtualBoxVM.app/Contents/MacOS/
     170 VirtualBoxVM_INST.darwin   = $(INST_VIRTUALBOX)Contents/Resources/VirtualBoxVM.app/Contents/MacOS/
    171171endif
    172172VirtualBoxVM_DEPS           = $(UICommon_0_OUTDIR)/include/COMWrappers
    … …  
    222222 VBOX_GUI_WITH_NETWORK_MANAGER := 1
    223223endif
    224 if  "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_EXTRADATA_MANAGER_UI)
     224if "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_EXTRADATA_MANAGER_UI)
    225225 VirtualBoxVM_DEFS          += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    226226endif
    … …  
    276276 VBOX_GUI_WITH_NETWORK_MANAGER := 1
    277277endif
    278 if  "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_EXTRADATA_MANAGER_UI)
     278if "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_EXTRADATA_MANAGER_UI)
    279279 UICommon_DEFS        += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    280280endif
    … …  
    345345
    346346ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    347 VBOX_GUI_INC_DIRS += \
    348         ./src/networking
     347 VBOX_GUI_INC_DIRS += \
     348        ./src/networking
    349349endif
    350350
    … …  
    381381#
    382382ifneq ($(KBUILD_TARGET),win)
    383 VirtualBox_CXXFLAGS += -Wno-switch
     383 VirtualBox_CXXFLAGS += -Wno-switch
    384384endif
    385385
    … …  
    430430
    431431VirtualBoxVM_LDFLAGS.darwin = \
    432         $(if $(VBOX_WITH_HARDENING)\
     432        $(if $(VBOX_WITH_HARDENING) \
    433433        ,-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VirtualBoxVM.dylib \
    434434        ,-rpath @executable_path/../../../../MacOS \
    435435        -rpath @executable_path/../../../../Frameworks) \
    436         -framework AppKit -framework Carbon -framework IOKit \
     436        -framework AppKit -framework Carbon -framework IOKit
    437437
    438438ifdef VBOX_GUI_WITH_QTGLFRAMEBUFFER
    … …  
    786786ifdef VBOX_WITH_DRAG_AND_DROP
    787787 VirtualBoxVM_QT_MOCHDRS += \
    788         src/runtime/UIDnDHandler.h
     788        src/runtime/UIDnDHandler.h
    789789 ifdef VBOX_WITH_DRAG_AND_DROP_GH
    790790  VirtualBoxVM_QT_MOCHDRS += \
    791         src/runtime/UIDnDMIMEData.h
     791        src/runtime/UIDnDMIMEData.h
    792792 endif
    793793endif
    … …  
    10061006ifdef VBOX_WITH_QHELP_VIEWER
    10071007 UICommon_QT_MOCHDRS += \
    1008         src/helpbrowser/UIHelpViewer.h \
    1009         src/helpbrowser/UIHelpBrowserWidget.h
     1008        src/helpbrowser/UIHelpViewer.h \
     1009        src/helpbrowser/UIHelpBrowserWidget.h
    10101010endif
    10111011
    10121012ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    10131013 UICommon_QT_MOCHDRS += \
    1014         src/networking/UIDownloader.h \
    1015         src/networking/UIDownloaderExtensionPack.h \
    1016         src/networking/UIDownloaderGuestAdditions.h \
    1017         src/networking/UIDownloaderUserManual.h \
    1018         src/networking/UINetworkCustomer.h \
    1019         src/networking/UINetworkRequestManager.h \
    1020         src/networking/UINetworkRequest.h \
    1021         src/networking/UINetworkReply.h \
    1022         src/networking/UINewVersionChecker.h \
    1023         src/networking/UIUpdateManager.h \
    1024         src/settings/editors/UIUpdateSettingsEditor.h \
    1025         src/settings/global/UIGlobalSettingsProxy.h \
    1026         src/settings/global/UIGlobalSettingsUpdate.h
     1014        src/networking/UIDownloader.h \
     1015        src/networking/UIDownloaderExtensionPack.h \
     1016        src/networking/UIDownloaderGuestAdditions.h \
     1017        src/networking/UIDownloaderUserManual.h \
     1018        src/networking/UINetworkCustomer.h \
     1019        src/networking/UINetworkRequestManager.h \
     1020        src/networking/UINetworkRequest.h \
     1021        src/networking/UINetworkReply.h \
     1022        src/networking/UINewVersionChecker.h \
     1023        src/networking/UIUpdateManager.h \
     1024        src/settings/editors/UIUpdateSettingsEditor.h \
     1025        src/settings/global/UIGlobalSettingsProxy.h \
     1026        src/settings/global/UIGlobalSettingsUpdate.h
    10271027endif
    10281028
    … …  
    11191119ifdef VBOX_WITH_QHELP_VIEWER
    11201120 UICommon_QT_MOCSRCS += \
    1121         src/helpbrowser/UIHelpViewer.cpp \
    1122         src/helpbrowser/UIHelpBrowserWidget.cpp
     1121        src/helpbrowser/UIHelpViewer.cpp \
     1122        src/helpbrowser/UIHelpBrowserWidget.cpp
    11231123endif
    11241124
    11251125ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    11261126 UICommon_QT_MOCSRCS += \
    1127         src/networking/UINetworkReply.cpp \
    1128         src/networking/UIUpdateManager.cpp
     1127        src/networking/UINetworkReply.cpp \
     1128        src/networking/UIUpdateManager.cpp
    11291129endif
    11301130
    11311131ifdef VBOX_WITH_XPCOM
    11321132 UICommon_QT_MOCSRCS += \
    1133         src/globals/COMDefs.cpp
     1133        src/globals/COMDefs.cpp
    11341134endif
    11351135
    … …  
    11391139ifndef VBOX_GUI_WITH_CUSTOMIZATIONS1
    11401140 UICommon_QT_MOCSRCS.linux += \
    1141         src/globals/UIDesktopWidgetWatchdog.cpp
     1141        src/globals/UIDesktopWidgetWatchdog.cpp
    11421142 UICommon_QT_MOCSRCS.solaris += \
    1143         src/globals/UIDesktopWidgetWatchdog.cpp
     1143        src/globals/UIDesktopWidgetWatchdog.cpp
    11441144 UICommon_QT_MOCSRCS.freebsd += \
    1145         src/globals/UIDesktopWidgetWatchdog.cpp
     1145        src/globals/UIDesktopWidgetWatchdog.cpp
    11461146endif
    11471147
    … …  
    13361336ifdef VBOX_WITH_DRAG_AND_DROP
    13371337 VirtualBoxVM_SOURCES += \
    1338         src/runtime/UIDnDHandler.cpp
     1338        src/runtime/UIDnDHandler.cpp
    13391339 ifdef VBOX_WITH_DRAG_AND_DROP_GH
    13401340  VirtualBoxVM_SOURCES += \
    1341         src/runtime/UIDnDMIMEData.cpp
     1341        src/runtime/UIDnDMIMEData.cpp
    13421342  VirtualBoxVM_SOURCES.win += \
    1343         src/runtime/UIDnDDropSource_win.cpp \
    1344         src/runtime/UIDnDDataObject_win.cpp \
    1345         src/runtime/UIDnDEnumFormat_win.cpp
     1343        src/runtime/UIDnDDropSource_win.cpp \
     1344        src/runtime/UIDnDDataObject_win.cpp \
     1345        src/runtime/UIDnDEnumFormat_win.cpp
    13461346 endif
    13471347endif
    … …  
    13521352
    13531353ifdef VBOX_WITH_HARDENING
    1354 $(call VBOX_SET_VER_INFO_DLL,VirtualBoxVM,VirtualBox Virtual Machine (dll),$(VBOX_WINDOWS_ICON_FILE))
     1354 $(call VBOX_SET_VER_INFO_DLL,VirtualBoxVM,VirtualBox Virtual Machine (dll),$(VBOX_WINDOWS_ICON_FILE))
    13551355else
    1356 $(call VBOX_SET_VER_INFO_EXE,VirtualBoxVM,VirtualBox Virtual Machine,$(VBOX_WINDOWS_ICON_FILE))
     1356 $(call VBOX_SET_VER_INFO_EXE,VirtualBoxVM,VirtualBox Virtual Machine,$(VBOX_WINDOWS_ICON_FILE))
    13571357endif
    13581358
    … …  
    15901590ifdef VBOX_WITH_QHELP_VIEWER
    15911591 UICommon_SOURCES += \
    1592         src/helpbrowser/UIHelpViewer.cpp \
    1593         src/helpbrowser/UIHelpBrowserWidget.cpp
     1592        src/helpbrowser/UIHelpViewer.cpp \
     1593        src/helpbrowser/UIHelpBrowserWidget.cpp
    15941594endif
    15951595
    15961596ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    15971597 UICommon_SOURCES += \
    1598         src/networking/UIDownloader.cpp \
    1599         src/networking/UIDownloaderExtensionPack.cpp \
    1600         src/networking/UIDownloaderGuestAdditions.cpp \
    1601         src/networking/UIDownloaderUserManual.cpp \
    1602         src/networking/UINetworkCustomer.cpp \
    1603         src/networking/UINetworkRequestManager.cpp \
    1604         src/networking/UINetworkRequest.cpp \
    1605         src/networking/UINetworkReply.cpp \
    1606         src/networking/UIUpdateDefs.cpp \
    1607         src/networking/UINewVersionChecker.cpp \
    1608         src/networking/UIUpdateManager.cpp \
    1609         src/settings/editors/UIUpdateSettingsEditor.cpp \
    1610         src/settings/global/UIGlobalSettingsProxy.cpp \
    1611         src/settings/global/UIGlobalSettingsUpdate.cpp
     1598        src/networking/UIDownloader.cpp \
     1599        src/networking/UIDownloaderExtensionPack.cpp \
     1600        src/networking/UIDownloaderGuestAdditions.cpp \
     1601        src/networking/UIDownloaderUserManual.cpp \
     1602        src/networking/UINetworkCustomer.cpp \
     1603        src/networking/UINetworkRequestManager.cpp \
     1604        src/networking/UINetworkRequest.cpp \
     1605        src/networking/UINetworkReply.cpp \
     1606        src/networking/UIUpdateDefs.cpp \
     1607        src/networking/UINewVersionChecker.cpp \
     1608        src/networking/UIUpdateManager.cpp \
     1609        src/settings/editors/UIUpdateSettingsEditor.cpp \
     1610        src/settings/global/UIGlobalSettingsProxy.cpp \
     1611        src/settings/global/UIGlobalSettingsUpdate.cpp
    16121612endif
    16131613
    16141614if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
    16151615 UICommon_SOURCES += \
    1616         src/platform/x11/VBoxUtils-x11.cpp \
    1617         src/platform/x11/XKeyboard-new.cpp
     1616        src/platform/x11/VBoxUtils-x11.cpp \
     1617        src/platform/x11/XKeyboard-new.cpp
    16181618endif
    16191619
    … …  
    16431643 VirtualBox.qt.conf_SOURCES = $(VirtualBox_0_OUTDIR)/qt.conf=>qt.conf
    16441644
    1645 $$(VirtualBox_0_OUTDIR)/qt.conf: $(PATH_SUB_CURRENT)/Makefile.kmk $(VBOX_VERSION_MK) | $$(@D)/
     1645 $$(VirtualBox_0_OUTDIR)/qt.conf: $(PATH_SUB_CURRENT)/Makefile.kmk $(VBOX_VERSION_MK) | $$(@D)/
    16461646        $(QUIET)$(RM) -f $@
    16471647        $(QUIET)$(APPEND) $@ "[Paths]"
    … …  
    17951795, $(UICommon_VBOX_COMWRAPPERS) \
    17961796, $$(UICommon_0_OUTDIR)/include/COMEnums.h \
    1797   $$(UICommon_0_OUTDIR)/include/COMWrappers.cpp \
     1797$$(UICommon_0_OUTDIR)/include/COMWrappers.cpp \
    17981798): \
    17991799                $(VBOX_XIDL_FILE) \
    … …  
    18521852#
    18531853ifdef VBOX_WITH_PRECOMPILED_HEADERS
    1854  if1of ($(KBUILD_TARGET),win)
     1854 if1of ($(KBUILD_TARGET), win)
    18551855  VirtualBox_USES      += vccprecomp
    18561856  VirtualBox_PCH_HDR   := $(PATH_SUB_CURRENT)/src/precomp_vcc.h
    … …  
    18841884
    18851885ifeq ($(KBUILD_TARGET),win)
    1886 #
    1887 # On Windows we'll have to generate/edit part of the resource file.
    1888 # The IDI_ICON1 name is Qt specific.
    1889 #
    1890 src/platform/win/VirtualBox.rc_INCS = $(VirtualBox_0_OUTDIR)
    1891 src/platform/win/VirtualBox.rc_DEPS = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
    1892 src/platform/win/VirtualBox.rc_CLEAN = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
    1893 src/platform/win/VirtualBoxVM.rc_INCS = $(VirtualBox_0_OUTDIR)
    1894 src/platform/win/VirtualBoxVM.rc_DEPS = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
    1895 src/platform/win/VirtualBoxVM.rc_CLEAN = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
    1896 
    1897 $$(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$@)
     1886 #
     1887 # On Windows we'll have to generate/edit part of the resource file.
     1888 # The IDI_ICON1 name is Qt specific.
     1889 #
     1890 src/platform/win/VirtualBox.rc_INCS = $(VirtualBox_0_OUTDIR)
     1891 src/platform/win/VirtualBox.rc_DEPS = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
     1892 src/platform/win/VirtualBox.rc_CLEAN = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
     1893 src/platform/win/VirtualBoxVM.rc_INCS = $(VirtualBox_0_OUTDIR)
     1894 src/platform/win/VirtualBoxVM.rc_DEPS = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
     1895 src/platform/win/VirtualBoxVM.rc_CLEAN = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
     1896
     1897 $$(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$@)
    18981898        $(APPEND) -t $@ 'IDI_ICON1 ICON "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
    18991899
    … …  
    19101910
    19111911ifeq ($(KBUILD_TARGET),win)
    1912 #
    1913 # Install the visual manifest and associated PNGs.
    1914 #
    1915 INSTALLS.win += VirtualBoxManifest
    1916 VirtualBoxManifest_INST = $(INST_VIRTUALBOX)
    1917 VirtualBoxManifest_DEFPATH = $(PATH_ROOT)/src/VBox/Artwork/$(if-expr defined(VBOX_OSE),OSE,NonOSE)/
    1918 VirtualBoxManifest_SOURCES := \
    1919         virtualbox-70px.png=>VirtualBox_70px.png \
    1920         virtualbox-150px.png=>VirtualBox_150px.png \
    1921        $(PATH_SUB_CURRENT)/src/platform/win/VirtualBox.VisualElementsManifest.xml
     1912 #
     1913 # Install the visual manifest and associated PNGs.
     1914 #
     1915 INSTALLS.win += VirtualBoxManifest
     1916 VirtualBoxManifest_INST = $(INST_VIRTUALBOX)
     1917 VirtualBoxManifest_DEFPATH = $(PATH_ROOT)/src/VBox/Artwork/$(if-expr defined(VBOX_OSE),OSE,NonOSE)/
     1918 VirtualBoxManifest_SOURCES := \
     1919        virtualbox-70px.png=>VirtualBox_70px.png \
     1920        virtualbox-150px.png=>VirtualBox_150px.png \
     1921        $(PATH_SUB_CURRENT)/src/platform/win/VirtualBox.VisualElementsManifest.xml
    19221922
    19231923endif
    … …  
    19251925
    19261926ifeq ($(KBUILD_TARGET),darwin)
    1927 #
    1928 # Create directories for each approved language or the application
    1929 # menu won't be translated.
    1930 #
    1931 INSTALLS += VirtualBox.lproj
    1932 VirtualBox.lproj_INST = $(INST_VIRTUALBOX)Contents/Resources/
    1933 VirtualBox.lproj_MODE = 755
    1934 VirtualBox.lproj_DIRS := $(addsuffix .lproj,$(VBOX_APPROVED_GUI_LANGUAGES))
    1935 
    1936 #
    1937 # On OS X (darwin) we need to install icon resources and compulsory bundle contents.
    1938 # The VirtualBoxVM.app helper is for launching VMs (fixes some issues with the dock).
    1939 #
    1940 INSTALLS += VirtualBox.app
    1941 VirtualBox.app_INST = $(INST_VIRTUALBOX)Contents/
    1942 VirtualBox.app_MODE = 644
    1943 VirtualBox.app_SOURCES = \
    1944         src/platform/darwin/PkgInfo \
    1945         $(VirtualBox.app_0_OUTDIR)/Info.plist \
    1946         $(VBOX_MACOSX_ICON_FILE)=>Resources/virtualbox.icns \
    1947         $(VBOX_BRAND_GUI_VBOX_64PX_PNG)=>Resources/virtualbox.png \
    1948         $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-vbox.icns=>Resources/virtualbox-vbox.icns \
    1949         $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-vbox-extpack.icns=>Resources/virtualbox-vbox-extpack.icns \
    1950         $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-ovf.icns=>Resources/virtualbox-ovf.icns \
    1951         $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns \
    1952         $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-vdi.icns=>Resources/virtualbox-vdi.icns \
    1953         $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-vmdk.icns=>Resources/virtualbox-vmdk.icns \
    1954         $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-vhd.icns=>Resources/virtualbox-vhd.icns \
    1955         $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-hdd.icns=>Resources/virtualbox-hdd.icns
     1927 #
     1928 # Create directories for each approved language or the application
     1929 # menu won't be translated.
     1930 #
     1931 INSTALLS += VirtualBox.lproj
     1932 VirtualBox.lproj_INST = $(INST_VIRTUALBOX)Contents/Resources/
     1933 VirtualBox.lproj_MODE = 755
     1934 VirtualBox.lproj_DIRS := $(addsuffix .lproj,$(VBOX_APPROVED_GUI_LANGUAGES))
     1935
     1936 #
     1937 # On OS X (darwin) we need to install icon resources and compulsory bundle contents.
     1938 # The VirtualBoxVM.app helper is for launching VMs (fixes some issues with the dock).
     1939 #
     1940 INSTALLS += VirtualBox.app
     1941 VirtualBox.app_INST = $(INST_VIRTUALBOX)Contents/
     1942 VirtualBox.app_MODE = 644
     1943 VirtualBox.app_SOURCES = \
     1944        src/platform/darwin/PkgInfo \
     1945        $(VirtualBox.app_0_OUTDIR)/Info.plist \
     1946        $(VBOX_MACOSX_ICON_FILE)=>Resources/virtualbox.icns \
     1947        $(VBOX_BRAND_GUI_VBOX_64PX_PNG)=>Resources/virtualbox.png \
     1948        $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-vbox.icns=>Resources/virtualbox-vbox.icns \
     1949        $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-vbox-extpack.icns=>Resources/virtualbox-vbox-extpack.icns \
     1950        $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-ovf.icns=>Resources/virtualbox-ovf.icns \
     1951        $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns \
     1952        $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-vdi.icns=>Resources/virtualbox-vdi.icns \
     1953        $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-vmdk.icns=>Resources/virtualbox-vmdk.icns \
     1954        $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-vhd.icns=>Resources/virtualbox-vhd.icns \
     1955        $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-hdd.icns=>Resources/virtualbox-hdd.icns
    19561956
    19571957 # Qt5 requires qt.conf on Mac OS X:
    … …  
    19861986        $(VirtualBoxVM.app_0_OUTDIR)/VM-Info.plist=>Info.plist \
    19871987        $(foreach mysrc,$(VirtualBox.app_SOURCES),$(if-expr $(pos =>Resources/,$(mysrc)) > 0,$(mysrc),))
    1988 ifdef VBOX_WITH_INTNET_SERVICE_IN_R3
    1989  VirtualBoxVM.app_SYMLINKS = \
    1990         XPCServices=>../../../XPCServices
    1991 endif
     1988 ifdef VBOX_WITH_INTNET_SERVICE_IN_R3
     1989  VirtualBoxVM.app_SYMLINKS = \
     1990        XPCServices=>../../../XPCServices
     1991 endif
    19921992
    19931993 $$(VirtualBoxVM.app_0_OUTDIR)/VM-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/VM-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
    … …  
    20192019        $(foreach mysrc,$(VirtualBox.app_SOURCES),$(if-expr $(pos =>Resources/,$(mysrc)) > 0,$(mysrc),))
    20202020 vmstarter.app_SYMLINKS = \
    2021         MacOS=>../../../MacOS \
     2021        MacOS=>../../../MacOS
    20222022
    20232023 $$(vmstarter.app_0_OUTDIR)/vmstarter-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/vmstarter-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
    … …  
    20682068QTGUI_DOXYFILE_INPUT_DIRS := \
    20692069        $(addprefix $(PATH_SUB_CURRENT)/src/, \
    2070                 converter \
    2071                 extensions \
    2072                 extensions/graphics \
    2073                 extradata \
    2074                 globals \
    2075                 manager \
    2076                 manager/chooser \
    2077                 manager/details \
    2078                 manager/tools \
    2079                 manager \
    2080                 manager \
    2081                 medium \
    2082                 net \
    2083                 objects \
    2084                 platform \
    2085                 platform/darwin \
    2086                 platform/os2 \
    2087                 platform/win \
    2088                 platform/x11 \
    2089                 runtime \
    2090                 runtime/fullscreen \
    2091                 runtime/information \
    2092                 runtime/guestctrl \
    2093                 runtime/normal \
    2094                 runtime/scale \
    2095                 runtime/seamless \
    2096                 selector \
    2097                 selector/graphics \
    2098                 selector/graphics/chooser \
    2099                 selector/graphics/details \
    2100                 settings \
    2101                 settings/global \
    2102                 settings/machine \
    2103                 widgets \
    2104                 widgets/graphics \
    2105                 wizards \
    2106                 wizards/addcloudvm \
    2107                 wizards/clonevd \
    2108                 wizards/clonevm \
    2109                 wizards/exportappliance \
    2110                 wizards/importappliance \
    2111                 wizards/newcloudvm \
    2112                 wizards/newvd \
    2113                 wizards/newvm)
     2070        converter \
     2071        extensions \
     2072        extensions/graphics \
     2073        extradata \
     2074        globals \
     2075        manager \
     2076        manager/chooser \
     2077        manager/details \
     2078        manager/tools \
     2079        manager \
     2080        manager \
     2081        medium \
     2082        net \
     2083        objects \
     2084        platform \
     2085        platform/darwin \
     2086        platform/os2 \
     2087        platform/win \
     2088        platform/x11 \
     2089        runtime \
     2090        runtime/fullscreen \
     2091        runtime/information \
     2092        runtime/guestctrl \
     2093        runtime/normal \
     2094        runtime/scale \
     2095        runtime/seamless \
     2096        selector \
     2097        selector/graphics \
     2098        selector/graphics/chooser \
     2099        selector/graphics/details \
     2100        settings \
     2101        settings/global \
     2102        settings/machine \
     2103        widgets \
     2104        widgets/graphics \
     2105        wizards \
     2106        wizards/addcloudvm \
     2107        wizards/clonevd \
     2108        wizards/clonevm \
     2109        wizards/exportappliance \
     2110        wizards/importappliance \
     2111        wizards/newcloudvm \
     2112        wizards/newvd \
     2113        wizards/newvm)
    21142114
    21152115QTGUI_DOXYFILE_INPUT := \
    21162116        $(foreach dir, $(QTGUI_DOXYFILE_INPUT_DIRS), \
    2117                 $(sort $(wildcard $(dir)/*.h)) \
    2118                 $(sort $(wildcard $(dir)/*.cpp $(dir)/*.m $(dir)/*.mm)))
     2117        $(sort $(wildcard $(dir)/*.h)) \
     2118        $(sort $(wildcard $(dir)/*.cpp $(dir)/*.m $(dir)/*.mm)))
    21192119
    21202120includedep $(QTGUI_DOXYFILE_OUTPUT)/Doxyfile.qtgui.dep
    … …  
    21532153docs.qtgui: $(QTGUI_DOXYFILE_OUTPUT)/docs.qtgui
    21542154if !defined(VBOX_ONLY_DOCS) && defined(VBOX_WITH_ALL_DOXYGEN_TARGETS)
    2155 docs: $(QTGUI_DOXYFILE_OUTPUT)/docs.qtgui
     2155 docs: $(QTGUI_DOXYFILE_OUTPUT)/docs.qtgui
    21562156endif
    21572157

  • trunk/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk

    r98103 r98412  
    2828# The list of approved GUI languages.
    2929VBOX_APPROVED_GUI_LANGUAGES := \
    30         bg    \
    31         ca    \
    32         cs    \
    33         da    \
    34         de    \
    35         el    \
    36         en    \
    37         es    \
    38         eu    \
    39         fa    \
    40         fr    \
     30        bg \
     31        ca \
     32        cs \
     33        da \
     34        de \
     35        el \
     36        en \
     37        es \
     38        eu \
     39        fa \
     40        fr \
    4141        hr_HR \
    42         hu    \
    43         id    \
    44         it    \
    45         ja    \
    46         ka    \
    47         ko    \
    48         lt    \
    49         nl    \
    50         pl    \
    51         pt    \
     42        hu \
     43        id \
     44        it \
     45        ja \
     46        ka \
     47        ko \
     48        lt \
     49        nl \
     50        pl \
     51        pt \
    5252        pt_BR \
    53         ru    \
    54         sk    \
    55         sl    \
    56         th    \
    57         tr    \
    58         uk    \
     53        ru \
     54        sk \
     55        sl \
     56        th \
     57        tr \
     58        uk \
    5959        zh_CN \
    6060        zh_TW
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette