VirtualBox

Ignore:
Timestamp:
Jun 26, 2019 3:57:32 PM (5 years ago)
Author:
vboxsync
Message:

Renaming VBoxGlobal to UICommon for bugref:9049 as planned.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r79244 r79365  
    3535 PROGRAMS += VirtualBoxHardenedVM
    3636 DLLS += VirtualBoxVM
    37  DLLS += VBoxGlobal
     37 DLLS += UICommon
    3838else
    3939 PROGRAMS += VirtualBox
    4040 PROGRAMS += VirtualBoxVM
    41  DLLS += VBoxGlobal
     41 DLLS += UICommon
    4242endif
    4343INSTALLS += VirtualBox.nls
    … …  
    9999VirtualBox_TEMPLATE      := VBOXQTGUIEXE
    100100VirtualBox_NAME           = VirtualBox
    101 VirtualBox_DEPS           = $(VBoxGlobal_0_OUTDIR)/include/COMWrappers
     101VirtualBox_DEPS           = $(UICommon_0_OUTDIR)/include/COMWrappers
    102102VirtualBox_SDKS.win       = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
    103103VirtualBox_DEFS           =
    … …  
    169169VirtualBoxVM_TEMPLATE       := $(if $(VBOX_WITH_HARDENING),VBOXQTGUI,VBOXQTGUIEXE)
    170170VirtualBoxVM_NAME           = VirtualBoxVM
    171 VirtualBoxVM_DEPS           = $(VBoxGlobal_0_OUTDIR)/include/COMWrappers
     171VirtualBoxVM_DEPS           = $(UICommon_0_OUTDIR)/include/COMWrappers
    172172VirtualBoxVM_SDKS.win       = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
    173173VirtualBoxVM_DEFS           += VBOX_RUNTIME_UI
    … …  
    237237# VirtualBox - GUI Global Shared Library.
    238238#
    239 VBoxGlobal_TEMPLATE = VBOXQTGUI
    240 VBoxGlobal_NAME = VBoxGlobal
    241 VBoxGlobal_DEFS         =
    242 VBoxGlobal_DEFS        += VBOX_GUI_LIBRARY
    243 VBoxGlobal_DEFS.darwin  = VBOX_WS_MAC
    244 VBoxGlobal_DEFS.freebsd = VBOX_WS_X11
    245 VBoxGlobal_DEFS.linux   = VBOX_WS_X11
    246 VBoxGlobal_DEFS.solaris = VBOX_WS_X11
    247 VBoxGlobal_DEFS.win     = VBOX_WS_WIN
    248 VBoxGlobal_DEFS.debug   = VBOX_CHECK_STATE # QT_FATAL_ASSERT
    249 VBoxGlobal_DEFS.darwin  += VBOX_DARWIN_USE_NATIVE_CONTROLS
    250 #VBoxGlobal_DEFS.win     += UNICODE QT_DLL
    251 VBoxGlobal_DEFS         += \
     239UICommon_TEMPLATE = VBOXQTGUI
     240UICommon_NAME = UICommon
     241UICommon_DEFS         =
     242UICommon_DEFS        += VBOX_GUI_LIBRARY
     243UICommon_DEFS.darwin  = VBOX_WS_MAC
     244UICommon_DEFS.freebsd = VBOX_WS_X11
     245UICommon_DEFS.linux   = VBOX_WS_X11
     246UICommon_DEFS.solaris = VBOX_WS_X11
     247UICommon_DEFS.win     = VBOX_WS_WIN
     248UICommon_DEFS.debug   = VBOX_CHECK_STATE # QT_FATAL_ASSERT
     249UICommon_DEFS.darwin  += VBOX_DARWIN_USE_NATIVE_CONTROLS
     250#UICommon_DEFS.win     += UNICODE QT_DLL
     251UICommon_DEFS         += \
    252252        $(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \
    253253        $(if $(VBOX_GUI_WITH_NEW_MEDIA_EVENTS),VBOX_GUI_WITH_NEW_MEDIA_EVENTS) \
    … …  
    268268        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,)
    269269ifdef VBOX_WITH_DEBUGGER_GUI
    270  VBoxGlobal_DEFS        += VBOX_WITH_DEBUGGER_GUI
     270 UICommon_DEFS        += VBOX_WITH_DEBUGGER_GUI
    271271 if "$(KBUILD_TYPE)" != "release"
    272   VBoxGlobal_DEFS       += VBOX_WITH_DEBUGGER_GUI_MENU
     272  UICommon_DEFS       += VBOX_WITH_DEBUGGER_GUI_MENU
    273273 endif
    274274endif
    275275ifdef VBOX_WITH_VIDEOHWACCEL
    276  VBoxGlobal_DEFS        += VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL
     276 UICommon_DEFS        += VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL
    277277else ifdef VBOX_GUI_USE_QGL
    278  VBoxGlobal_DEFS        += VBOX_GUI_USE_QGL
     278 UICommon_DEFS        += VBOX_GUI_USE_QGL
    279279endif
    280280ifdef VBOX_WITH_LIBCURL
    281  VBoxGlobal_DEFS        += VBOX_GUI_WITH_NETWORK_MANAGER
     281 UICommon_DEFS        += VBOX_GUI_WITH_NETWORK_MANAGER
    282282 VBOX_GUI_WITH_NETWORK_MANAGER := 1
    283283endif
    284284if  "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_EXTRADATA_MANAGER_UI)
    285  VBoxGlobal_DEFS        += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     285 UICommon_DEFS        += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    286286endif
    287287ifndef VBOX_WITHOUT_LESS_VIRTUALBOX_INCLUDING
    288  VBoxGlobal_DEFS        += VBOX_WITH_LESS_VIRTUALBOX_INCLUDING
     288 UICommon_DEFS        += VBOX_WITH_LESS_VIRTUALBOX_INCLUDING
    289289endif
    290290
    … …  
    351351VirtualBox_INCS = \
    352352        $(VBOX_GUI_INC_DIRS) \
    353         $(VBoxGlobal_0_OUTDIR)/include \
     353        $(UICommon_0_OUTDIR)/include \
    354354        $(VBOX_GRAPHICS_INCS)
    355355
    … …  
    360360VirtualBoxVM_INCS = \
    361361        $(VBOX_GUI_INC_DIRS) \
    362         $(VBoxGlobal_0_OUTDIR)/include \
     362        $(UICommon_0_OUTDIR)/include \
    363363        $(VBOX_GRAPHICS_INCS)
    364364
    … …  
    367367# Include folders.
    368368#
    369 VBoxGlobal_INCS = \
     369UICommon_INCS = \
    370370        $(VBOX_GUI_INC_DIRS) \
    371         $(VBoxGlobal_0_OUTDIR)/include
     371        $(UICommon_0_OUTDIR)/include
    372372
    373373
    … …  
    448448## @todo we're using a number of deprecated APIs, please fix and remove these!
    449449ifdef VBOX_WITH_NEW_XCODE
    450  VBoxGlobal_CXXFLAGS.darwin    += -Wno-error=deprecated-declarations
    451  VBoxGlobal_OBJCFLAGS.darwin   += -Wno-error=deprecated-declarations
    452  VBoxGlobal_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations
     450 UICommon_CXXFLAGS.darwin    += -Wno-error=deprecated-declarations
     451 UICommon_OBJCFLAGS.darwin   += -Wno-error=deprecated-declarations
     452 UICommon_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations
    453453else
    454  VBoxGlobal_CXXFLAGS.darwin    += -Wno-deprecated-declarations
    455  VBoxGlobal_OBJCFLAGS.darwin   += -Wno-deprecated-declarations
    456  VBoxGlobal_OBJCXXFLAGS.darwin += -Wno-deprecated-declarations
    457 endif
    458 
    459 VBoxGlobal_LDFLAGS.darwin = \
     454 UICommon_CXXFLAGS.darwin    += -Wno-deprecated-declarations
     455 UICommon_OBJCFLAGS.darwin   += -Wno-deprecated-declarations
     456 UICommon_OBJCXXFLAGS.darwin += -Wno-deprecated-declarations
     457endif
     458
     459UICommon_LDFLAGS.darwin = \
    460460        -framework AppKit -framework Carbon -framework IOKit \
    461         $(if $(VBOX_WITH_HARDENING),-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxGlobal.dylib)
     461        $(if $(VBOX_WITH_HARDENING),-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/UICommon.dylib)
    462462
    463463if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    464  VBoxGlobal_LDFLAGS.darwin += -framework OpenGL
     464 UICommon_LDFLAGS.darwin += -framework OpenGL
    465465endif
    466466
    … …  
    513513# This one is global shared GUI library:
    514514ifeq ($(KBUILD_TARGET),win)
    515  VirtualBox_LIBS += $(PATH_STAGE_LIB)/VBoxGlobal$(VBOX_SUFF_LIB)
     515 VirtualBox_LIBS += $(PATH_STAGE_LIB)/UICommon$(VBOX_SUFF_LIB)
    516516else
    517  VirtualBox_LIBS += $(PATH_STAGE_DLL)/VBoxGlobal$(VBOX_SUFF_DLL)
     517 VirtualBox_LIBS += $(PATH_STAGE_DLL)/UICommon$(VBOX_SUFF_DLL)
    518518endif
    519519
    … …  
    565565
    566566ifeq ($(KBUILD_TARGET),win)
    567  VirtualBoxVM_LIBS += $(PATH_STAGE_LIB)/VBoxGlobal$(VBOX_SUFF_LIB)
     567 VirtualBoxVM_LIBS += $(PATH_STAGE_LIB)/UICommon$(VBOX_SUFF_LIB)
    568568else
    569  VirtualBoxVM_LIBS += $(PATH_STAGE_DLL)/VBoxGlobal$(VBOX_SUFF_DLL)
     569 VirtualBoxVM_LIBS += $(PATH_STAGE_DLL)/UICommon$(VBOX_SUFF_DLL)
    570570endif
    571571
    … …  
    577577
    578578# Xinerama library required for multi-monitor support:
    579 VBoxGlobal_LIBS.linux   += Xinerama
    580 VBoxGlobal_LIBS.solaris += Xinerama
    581 VBoxGlobal_LIBS.freebsd += Xinerama
     579UICommon_LIBS.linux   += Xinerama
     580UICommon_LIBS.solaris += Xinerama
     581UICommon_LIBS.freebsd += Xinerama
    582582
    583583# Various Windows hosts libraries:
    584 VBoxGlobal_LIBS.win = \
     584UICommon_LIBS.win = \
    585585        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib
    586586
    587587# VBox keyboard shared library for X11 hosts:
    588588if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
    589  VBoxGlobal_LIBS += $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
     589 UICommon_LIBS += $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
    590590endif
    591591
    592592# These are 2D Video Acceleration and 3D Acceleration related libs:
    593593if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    594  VBoxGlobal_LIBS.win     += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
    595  VBoxGlobal_LIBS.solaris += GL
    596  VBoxGlobal_LIBS.linux   += GL
    597  VBoxGlobal_LIBS.freebsd += GL
     594 UICommon_LIBS.win     += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
     595 UICommon_LIBS.solaris += GL
     596 UICommon_LIBS.linux   += GL
     597 UICommon_LIBS.freebsd += GL
    598598endif
    599599ifdef VBOX_WITH_CROGL
    600  VBoxGlobal_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)
     600 UICommon_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)
    601601endif
    602602if defined(VBOX_WITH_VIDEOHWACCEL)
    603603 if1of ($(KBUILD_TARGET), win linux freebsd)
    604   VBoxGlobal_LIBS += $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB)
     604  UICommon_LIBS += $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB)
    605605 endif
    606606endif
    … …  
    782782# Headers containing definitions of classes that use the Q_OBJECT macro.
    783783#
    784 VBoxGlobal_QT_MOCHDRS = \
     784UICommon_QT_MOCHDRS = \
    785785        src/VBoxAboutDlg.h \
    786786        src/VBoxLicenseViewer.h \
    … …  
    838838        src/globals/UITextTable.h \
    839839        src/globals/UIVirtualBoxEventHandler.h \
    840         src/globals/VBoxGlobal.h \
     840        src/globals/UICommon.h \
    841841        src/globals/VBoxUtils.h \
    842842        src/logviewer/UIVMLogPage.h \
    … …  
    923923
    924924ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    925  VBoxGlobal_QT_MOCHDRS += \
     925 UICommon_QT_MOCHDRS += \
    926926        src/net/UIDownloader.h \
    927927        src/net/UIDownloaderAdditions.h \
    … …  
    940940endif
    941941
    942 VBoxGlobal_QT_MOCHDRS.darwin += \
     942UICommon_QT_MOCHDRS.darwin += \
    943943        src/platform/darwin/UICocoaSpecialControls.h \
    944944        src/platform/darwin/UIWindowMenuManager.h
    … …  
    986986# Sources.
    987987#
    988 VBoxGlobal_QT_MOCSRCS = \
     988UICommon_QT_MOCSRCS = \
    989989        src/extensions/QIAdvancedSlider.cpp \
    990990        src/extensions/QIArrowSplitter.cpp \
    … …  
    10201020
    10211021ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    1022  VBoxGlobal_QT_MOCSRCS += \
     1022 UICommon_QT_MOCSRCS += \
    10231023        src/net/UINetworkReply.cpp \
    10241024        src/net/UIUpdateManager.cpp
    … …  
    10261026
    10271027ifdef VBOX_WITH_XPCOM
    1028  VBoxGlobal_QT_MOCSRCS += \
     1028 UICommon_QT_MOCSRCS += \
    10291029        src/globals/COMDefs.cpp
    10301030endif
    10311031
    1032 VBoxGlobal_QT_MOCSRCS.darwin += \
     1032UICommon_QT_MOCSRCS.darwin += \
    10331033        src/platform/darwin/UIWindowMenuManager.cpp
    10341034
    1035 VBoxGlobal_QT_MOCSRCS.linux += \
     1035UICommon_QT_MOCSRCS.linux += \
    10361036        src/globals/UIDesktopWidgetWatchdog.cpp
    1037 VBoxGlobal_QT_MOCSRCS.solaris += \
     1037UICommon_QT_MOCSRCS.solaris += \
    10381038        src/globals/UIDesktopWidgetWatchdog.cpp
    1039 VBoxGlobal_QT_MOCSRCS.freebsd += \
     1039UICommon_QT_MOCSRCS.freebsd += \
    10401040        src/globals/UIDesktopWidgetWatchdog.cpp
    10411041
    … …  
    12571257# Sources.
    12581258#
    1259 VBoxGlobal_SOURCES = \
     1259UICommon_SOURCES = \
    12601260        src/VBoxAboutDlg.cpp \
    12611261        src/VBoxLicenseViewer.cpp \
    … …  
    13231323        src/globals/UIVersion.cpp \
    13241324        src/globals/UIVirtualBoxEventHandler.cpp \
    1325         src/globals/VBoxGlobal.cpp \
     1325        src/globals/UICommon.cpp \
    13261326        src/logviewer/UIVMLogPage.cpp \
    13271327        src/logviewer/UIVMLogViewerBookmarksPanel.cpp \
    … …  
    14111411
    14121412ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    1413  VBoxGlobal_SOURCES += \
     1413 UICommon_SOURCES += \
    14141414        src/net/UIDownloader.cpp \
    14151415        src/net/UIDownloaderAdditions.cpp \
    … …  
    14301430
    14311431if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
    1432  VBoxGlobal_SOURCES += \
     1432 UICommon_SOURCES += \
    14331433        src/platform/x11/VBoxX11Helper.cpp \
    14341434        src/platform/x11/XKeyboard-new.cpp
    14351435endif
    14361436
    1437 VBoxGlobal_SOURCES.win += \
     1437UICommon_SOURCES.win += \
    14381438        src/platform/win/VBoxUtils-win.cpp \
    14391439        src/platform/win/WinKeyboard.cpp
    14401440
    1441 VBoxGlobal_SOURCES.darwin += \
     1441UICommon_SOURCES.darwin += \
    14421442        src/platform/darwin/CocoaEventHelper.mm \
    14431443        src/platform/darwin/DarwinKeyboard.cpp \
    … …  
    14491449
    14501450if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    1451  VBoxGlobal_SOURCES += \
     1451 UICommon_SOURCES += \
    14521452        src/VBox2DHelpers.cpp \
    14531453        src/VBoxGLSupportInfo.cpp
    … …  
    15101510# (The include directory and lib/framework for each module will be added by the Qt unit.)
    15111511#
    1512 VBoxGlobal_QT_MODULES = Core Gui Widgets
    1513 VBoxGlobal_QT_MODULES.linux   += X11Extras
    1514 VBoxGlobal_QT_MODULES.solaris += X11Extras
    1515 VBoxGlobal_QT_MODULES.freebsd += X11Extras
    1516 VBoxGlobal_QT_MODULES.darwin  += MacExtras
    1517 VBoxGlobal_QT_MODULES.win     += WinExtras
     1512UICommon_QT_MODULES = Core Gui Widgets
     1513UICommon_QT_MODULES.linux   += X11Extras
     1514UICommon_QT_MODULES.solaris += X11Extras
     1515UICommon_QT_MODULES.freebsd += X11Extras
     1516UICommon_QT_MODULES.darwin  += MacExtras
     1517UICommon_QT_MODULES.win     += WinExtras
    15181518if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    1519  VBoxGlobal_QT_MODULES += OpenGL
     1519 UICommon_QT_MODULES += OpenGL
    15201520endif
    15211521
    … …  
    15241524$(eval VirtualBox_SOURCES += $(FORMS))
    15251525$(eval VirtualBoxVM_SOURCES += $(FORMS))
    1526 $(eval VBoxGlobal_SOURCES += $(FORMS))
     1526$(eval UICommon_SOURCES += $(FORMS))
    15271527
    15281528
    15291529# Resource files with some OSE differences (VirtualBoxBrand.qrc is created further down).
    1530 VBoxGlobal_SOURCES          += VirtualBox1.qrc
     1530UICommon_SOURCES          += VirtualBox1.qrc
    15311531VirtualBox1.qrc_RCCFLAGS     = -name BASIC1
    1532 VBoxGlobal_SOURCES          += VirtualBox2.qrc
     1532UICommon_SOURCES          += VirtualBox2.qrc
    15331533VirtualBox2.qrc_RCCFLAGS     = -name BASIC2
    1534 VBoxGlobal_SOURCES          += VirtualBox1_x2.qrc
     1534UICommon_SOURCES          += VirtualBox1_x2.qrc
    15351535VirtualBox1_x2.qrc_RCCFLAGS  = -name BASIC1_X2
    1536 VBoxGlobal_SOURCES          += VirtualBox2_x2.qrc
     1536UICommon_SOURCES          += VirtualBox2_x2.qrc
    15371537VirtualBox2_x2.qrc_RCCFLAGS  = -name BASIC2_X2
    1538 VBoxGlobal_SOURCES          += VirtualBox1_x3.qrc
     1538UICommon_SOURCES          += VirtualBox1_x3.qrc
    15391539VirtualBox1_x3.qrc_RCCFLAGS  = -name BASIC1_X3
    1540 VBoxGlobal_SOURCES          += VirtualBox2_x3.qrc
     1540UICommon_SOURCES          += VirtualBox2_x3.qrc
    15411541VirtualBox2_x3.qrc_RCCFLAGS  = -name BASIC2_X3
    1542 VBoxGlobal_SOURCES          += VirtualBox1_x4.qrc
     1542UICommon_SOURCES          += VirtualBox1_x4.qrc
    15431543VirtualBox1_x4.qrc_RCCFLAGS  = -name BASIC1_X4
    1544 VBoxGlobal_SOURCES          += VirtualBox2_x4.qrc
     1544UICommon_SOURCES          += VirtualBox2_x4.qrc
    15451545VirtualBox2_x4.qrc_RCCFLAGS  = -name BASIC2_X4
    1546 VBoxGlobal_SOURCES          += VirtualBox_xml.qrc
     1546UICommon_SOURCES          += VirtualBox_xml.qrc
    15471547VirtualBox_xml.qrc_RCCFLAGS  = -name BASIC_XML
    1548 VBoxGlobal_SOURCES += $(VBOX_VIRTUALBOX_OUT_DIR)/VirtualBoxBrand.qrc
     1548UICommon_SOURCES += $(VBOX_VIRTUALBOX_OUT_DIR)/VirtualBoxBrand.qrc
    15491549$(VBOX_VIRTUALBOX_OUT_DIR)/VirtualBoxBrand.qrc_RCCFLAGS = -name BRAND
    15501550if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    1551  VBoxGlobal_SOURCES += VirtualBoxShaders.qrc
     1551 UICommon_SOURCES += VirtualBoxShaders.qrc
    15521552 VirtualBoxShaders.qrc_RCCFLAGS = -name SHADERS
    15531553endif
    … …  
    15621562VirtualBox_QT_TRANSLATIONS_INST = $(INST_BIN)nls/
    15631563# All files which contain translatable strings.
    1564 VirtualBox_VBOX_ALL_NLS_SOURCES = $(VirtualBox_SOURCES) $(VirtualBoxVM_SOURCES) $(VBoxGlobal_SOURCES)
     1564VirtualBox_VBOX_ALL_NLS_SOURCES = $(VirtualBox_SOURCES) $(VirtualBoxVM_SOURCES) $(UICommon_SOURCES)
    15651565
    15661566
    … …  
    15781578# VirtualBox - GUI Global Shared Library.
    15791579#
    1580 includedep $(PATH_TARGET)/VBoxGlobalComWrapperFiles.dep
    1581 VBoxGlobal_BLDDIRS       += $(VBoxGlobal_0_OUTDIR)/include
    1582 VBoxGlobal_INTERMEDIATES += $(VBoxGlobal_0_OUTDIR)/include/COMWrappers
    1583 VBoxGlobal_SOURCES       += $(VBoxGlobal_0_OUTDIR)/include/COMWrappers.cpp
    1584 VBoxGlobal_CLEAN         += $(wildcard $(VBoxGlobal_0_OUTDIR)/include/*) $(PATH_TARGET)/VBoxGlobalComWrapperFiles.dep
     1580includedep $(PATH_TARGET)/UICommonComWrapperFiles.dep
     1581UICommon_BLDDIRS       += $(UICommon_0_OUTDIR)/include
     1582UICommon_INTERMEDIATES += $(UICommon_0_OUTDIR)/include/COMWrappers
     1583UICommon_SOURCES       += $(UICommon_0_OUTDIR)/include/COMWrappers.cpp
     1584UICommon_CLEAN         += $(wildcard $(UICommon_0_OUTDIR)/include/*) $(PATH_TARGET)/UICommonComWrapperFiles.dep
    15851585
    15861586## @todo kmk doesn't remake optional outputs when they are missing...
    1587 $$(VBoxGlobal_0_OUTDIR)/include/COMWrappers \
    1588 + $(PATH_TARGET)/VBoxGlobalComWrapperFiles.dep \
    1589 +| $(if-expr defined(VBoxGlobal_VBOX_COMWRAPPERS) \
    1590 , $(VBoxGlobal_VBOX_COMWRAPPERS) \
    1591 , $$(VBoxGlobal_0_OUTDIR)/include/COMEnums.h \
    1592   $$(VBoxGlobal_0_OUTDIR)/include/COMWrappers.cpp \
     1587$$(UICommon_0_OUTDIR)/include/COMWrappers \
     1588+ $(PATH_TARGET)/UICommonComWrapperFiles.dep \
     1589+| $(if-expr defined(UICommon_VBOX_COMWRAPPERS) \
     1590, $(UICommon_VBOX_COMWRAPPERS) \
     1591, $$(UICommon_0_OUTDIR)/include/COMEnums.h \
     1592  $$(UICommon_0_OUTDIR)/include/COMWrappers.cpp \
    15931593): \
    15941594                $(VBOX_XIDL_FILE) \
    … …  
    15961596                $(VBOX_FILESPLIT) \
    15971597                | $$(dir $$@)
    1598         $(call MSG_GENERATE,VBoxGlobal,$<,$@)
    1599         $(QUIET)$(RM) -f -- "$@" "$(PATH_TARGET)/VBoxGlobalComWrapperFiles.dep"
     1598        $(call MSG_GENERATE,UICommon,$<,$@)
     1599        $(QUIET)$(RM) -f -- "$@" "$(PATH_TARGET)/UICommonComWrapperFiles.dep"
    16001600        $(QUIET)$(VBOX_XSLTPROC) -o $@ \
    16011601                $(VBOX_VIRTUALBOX_SRC)/src/globals/COMWrappers.xsl $<
    1602         $(QUIET)$(VBOX_FILESPLIT) $@ $(VBoxGlobal_0_OUTDIR)/include \
    1603                 $(PATH_TARGET)/VBoxGlobalComWrapperFiles.dep VBoxGlobal_VBOX_COMWRAPPERS
     1602        $(QUIET)$(VBOX_FILESPLIT) $@ $(UICommon_0_OUTDIR)/include \
     1603                $(PATH_TARGET)/UICommonComWrapperFiles.dep UICommon_VBOX_COMWRAPPERS
    16041604        $(APPEND) "$@"
    16051605
    16061606# alias for generating the COM Wrappers file.
    1607 testwrappers:: $$(VBoxGlobal_0_OUTDIR)/include/COMWrappers
     1607testwrappers:: $$(UICommon_0_OUTDIR)/include/COMWrappers
    16081608
    16091609
    … …  
    16541654  VirtualBoxVM_PCH_HDR := $(PATH_SUB_CURRENT)/src/precomp_vcc.h
    16551655
    1656   VBoxGlobal_USES      += vccprecomp
    1657   VBoxGlobal_PCH_HDR   := $(PATH_SUB_CURRENT)/src/precomp_vcc.h
     1656  UICommon_USES      += vccprecomp
     1657  UICommon_PCH_HDR   := $(PATH_SUB_CURRENT)/src/precomp_vcc.h
    16581658
    16591659 else if $(KBUILD_KMK_REVISION) >= 3256 && "$(KBUILD_TARGET)" != "darwin" && !defined(VBOX_WITHOUT_PRECOMPILED_HEADERS)
    16601660  if $(VBOX_GCC_VERSION_CXX) >= 50000 # GCC 4.x runs into trouble compiling the header.
    1661    VBoxGlobal_USES      += gccprecomp
    1662    VBoxGlobal_PCH_HDR   := $(PATH_SUB_CURRENT)/src/precomp_gcc.h
    1663    #VBoxGlobal_CXXFLAGS.linux += -H
     1661   UICommon_USES      += gccprecomp
     1662   UICommon_PCH_HDR   := $(PATH_SUB_CURRENT)/src/precomp_gcc.h
     1663   #UICommon_CXXFLAGS.linux += -H
    16641664
    16651665   VirtualBox_USES      += gccprecomp
    … …  
    18471847 tstDarwinKeyboard_LIBS = \
    18481848        $(LIB_RUNTIME)
    1849  tstDarwinKeyboard_LIBS += $(PATH_STAGE_DLL)/VBoxGlobal$(VBOX_SUFF_DLL)
     1849 tstDarwinKeyboard_LIBS += $(PATH_STAGE_DLL)/UICommon$(VBOX_SUFF_DLL)
    18501850endif
    18511851
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