VirtualBox

Changeset 35368 in vbox


Ignore:
Timestamp:
Dec 30, 2010 1:38:23 PM (14 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
69228
Message:

Main: source re-org.

Location:
trunk/src/VBox
Files:
6 added
4 deleted
6 edited
98 moved

Legend:

Unmodified
Added
Removed

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

    r33590 r35368  
    2323# Files from Main needed for building VBoxBFE
    2424#
    25 VBOXBFE_MAIN_CPP = MouseImpl.cpp
    26 VBOXBFE_MAIN_H  = MouseImpl.h ConsoleEvents.h
     25VBOXBFE_MAIN_SRCS = src-client/MouseImpl.cpp
     26VBOXBFE_MAIN_HDRS = MouseImpl.h ConsoleEvents.h
    2727
    2828#
    … …  
    6969        VMMDevInterface.cpp \
    7070        DisplayImpl.cpp \
    71         $(PATH_VBoxBFE)/MouseImpl.cpp \
    7271        KeyboardImpl.cpp \
    7372        StatusImpl.cpp \
    7473        MachineDebuggerImpl.cpp \
    75         VMControl.cpp
     74        VMControl.cpp \
     75        $(addprefix $(VBoxBFE_0_OUTDIR)/,$(notdir $(VBOXBFE_MAIN_SRCS)))
    7676
    7777ifdef VBOX_WITH_HGCM
    … …  
    166166        $(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@
    167167
    168 VBoxBFE_DEPS += $(addprefix $(PATH_VBoxBFE)/,$(VBOXBFE_MAIN_CPP) $(VBOXBFE_MAIN_H))
     168# Files we share with Main needs to be copied into the output dir.
     169VBoxBFE_INTERMEDIATES += $(addprefix $(VBoxBFE_0_OUTDIR)/,$(VBOXBFE_MAIN_HDRS))
     170VBoxBFE_CLEAN         += $(addprefix $(VBoxBFE_0_OUTDIR)/, $(VBOXBFE_MAIN_HDRS) $(VBOXBFE_MAIN_SRCS))
    169171
    170 # Pattern rules for copying needed files from Main
    171 $(addprefix $$(PATH_VBoxBFE)/,$(VBOXBFE_MAIN_CPP)): \
    172                 $$(PATH_VBoxBFE)/% : $(PATH_ROOT)/src/VBox/Main/% | $$(dir $$@)
     172define def_copy_main_file
     173$$(VBoxBFE_0_OUTDIR)/$(notdir $(file)): $(PATH_ROOT)/src/VBox/Main/$(file) | $$(dir $$@)
    173174        $(call MSG_INST_FILE,$<,$@)
    174         $(QUIET)$(CP_EXT) $< $@
     175        $(QUIET)$(CP_EXT) -f $< $@
     176endef
     177$(foreach file,$(addprefix include/,$(VBOXBFE_MAIN_HDRS)), $(evalval def_copy_main_file))
     178$(foreach file,$(VBOXBFE_MAIN_SRCS), $(evalval def_copy_main_file))
    175179
    176 $(addprefix $$(PATH_VBoxBFE)/,$(VBOXBFE_MAIN_H)): \
    177                 $$(PATH_VBoxBFE)/% : $(PATH_ROOT)/src/VBox/Main/include/% | $$(dir $$@)
    178         $(call MSG_INST_FILE,$<,$@)
    179         $(QUIET)$(CP_EXT) $< $@
    180 
    181 OTHER_CLEAN += \
    182         $(addprefix $(PATH_VBoxBFE)/,$(VBOXBFE_MAIN_CPP)) \
    183         $(addprefix $(PATH_VBoxBFE)/,$(VBOXBFE_MAIN_H))
    184180
    185181

  • trunk/src/VBox/Main/Makefile.kmk

    r35358 r35368  
    279279
    280280VBoxSVC_SOURCES = \
    281         Global.cpp \
    282         Logging.cpp \
    283         Matching.cpp \
     281        src-all/DisplayPNGUtil.cpp \
     282        src-all/DisplayResampleImage.cpp \
     283        src-all/DisplayUtils.cpp \
     284        src-all/EventImpl.cpp \
     285        src-all/Global.cpp \
     286        src-all/Logging.cpp \
     287        src-all/PciDeviceAttachmentImpl.cpp \
     288        src-all/ProgressImpl.cpp \
     289        src-all/SharedFolderImpl.cpp \
     290        src-all/VirtualBoxBase.cpp \
     291        src-all/VirtualBoxErrorInfoImpl.cpp \
     292        $(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \
     293        src-server/ApplianceImpl.cpp \
     294        src-server/ApplianceImplExport.cpp \
     295        src-server/ApplianceImplImport.cpp \
     296        src-server/ApplianceImplIO.cpp \
     297        src-server/AudioAdapterImpl.cpp \
     298        src-server/BandwidthControlImpl.cpp \
     299        src-server/BandwidthGroupImpl.cpp \
     300        src-server/BIOSSettingsImpl.cpp \
     301        src-server/DHCPServerImpl.cpp \
     302        src-server/DHCPServerRunner.cpp \
     303        src-server/GuestOSTypeImpl.cpp \
     304        src-server/HostImpl.cpp \
     305        src-server/HostNetworkInterfaceImpl.cpp \
     306        src-server/HostPower.cpp \
     307        src-server/MachineImpl.cpp \
     308        src-server/Matching.cpp \
     309        src-server/MediumAttachmentImpl.cpp \
     310        src-server/MediumFormatImpl.cpp \
     311        src-server/MediumImpl.cpp \
     312        src-server/MediumLock.cpp \
     313        src-server/NATEngineImpl.cpp \
     314        src-server/NetworkAdapterImpl.cpp \
     315        src-server/ParallelPortImpl.cpp \
     316        src-server/ProgressProxyImpl.cpp \
     317        src-server/SerialPortImpl.cpp \
     318        src-server/SnapshotImpl.cpp \
     319        src-server/StorageControllerImpl.cpp \
     320        src-server/SystemPropertiesImpl.cpp \
     321        src-server/USBControllerImpl.cpp \
     322        src-server/VFSExplorerImpl.cpp \
     323        src-server/VirtualBoxImpl.cpp \
     324        src-server/VRDEServerImpl.cpp \
     325        xml/ovfreader.cpp \
    284326        xml/Settings.cpp \
    285         VirtualBoxBase.cpp \
    286         VirtualBoxErrorInfoImpl.cpp \
    287         VirtualBoxImpl.cpp \
    288         ApplianceImpl.cpp \
    289         ApplianceImplIO.cpp \
    290         ApplianceImplExport.cpp \
    291         ApplianceImplImport.cpp \
    292         xml/ovfreader.cpp \
    293         VFSExplorerImpl.cpp \
    294         MachineImpl.cpp \
    295         PciDeviceAttachmentImpl.cpp \
    296         SnapshotImpl.cpp \
    297         MediumImpl.cpp \
    298         MediumLock.cpp \
    299         MediumAttachmentImpl.cpp \
    300         MediumFormatImpl.cpp \
    301         ProgressImpl.cpp \
    302         ProgressProxyImpl.cpp \
    303         HostImpl.cpp \
    304         HostNetworkInterfaceImpl.cpp \
    305         DHCPServerImpl.cpp \
    306         DHCPServerRunner.cpp \
    307         GuestOSTypeImpl.cpp \
    308         NATEngineImpl.cpp \
    309         NetworkAdapterImpl.cpp \
    310         SerialPortImpl.cpp \
    311         ParallelPortImpl.cpp \
    312         USBControllerImpl.cpp \
    313         StorageControllerImpl.cpp \
    314         AudioAdapterImpl.cpp \
    315         SharedFolderImpl.cpp \
    316         SystemPropertiesImpl.cpp \
    317         BIOSSettingsImpl.cpp \
    318         HostPower.cpp \
    319         EventImpl.cpp \
    320         DisplayUtils.cpp \
    321         DisplayPNGUtil.cpp \
    322         DisplayResampleImage.cpp \
    323         BandwidthControlImpl.cpp \
    324         BandwidthGroupImpl.cpp \
     327        $(VBOX_XML_SCHEMADEFS_CPP) \
    325328        $(VBOX_AUTOGEN_EVENT_CPP) \
    326         VRDEServerImpl.cpp \
    327         $(if $(VBOX_WITH_XPCOM),xpcom/server.cpp,) \
    328         $(VBOX_XML_SCHEMADEFS_CPP) \
    329         $(if $(VBOX_WITH_EXTPACK),ExtPackManagerImpl.cpp ExtPackUtil.cpp,)
     329        $(if $(VBOX_WITH_XPCOM),src-server/xpcom/server.cpp,)
    330330
    331331VBoxSVC_SOURCES.darwin = \
    332         darwin/iokit.cpp \
    333         darwin/HostPowerDarwin.cpp
     332        src-server/darwin/iokit.cpp \
     333        src-server/darwin/HostPowerDarwin.cpp
    334334
    335335ifdef VBOX_WITH_CROGL
    336336  ifneq ($(KBUILD_TARGET),darwin)
    337     VBoxSVC_SOURCES += generic/OpenGLTest.cpp
     337    VBoxSVC_SOURCES += src-server/generic/OpenGLTest.cpp
    338338  endif
    339  VBoxSVC_SOURCES.darwin += darwin/OpenGLTestDarwin.cpp
     339 VBoxSVC_SOURCES.darwin += src-server/darwin/OpenGLTestDarwin.cpp
    340340endif
    341341
    342342VBoxSVC_SOURCES.win = \
    343         win/svcmain.cpp \
    344         win/svchlp.cpp \
    345         win/HostPowerWin.cpp \
    346         win/VBoxSVC.rc \
    347         win/VBoxComEvents.cpp
     343        src-server/win/svcmain.cpp \
     344        src-server/win/svchlp.cpp \
     345        src-server/win/HostPowerWin.cpp \
     346        src-server/win/VBoxSVC.rc \
     347        src-server/win/VBoxComEvents.cpp
    348348
    349349VBoxSVC_SOURCES.linux = \
    350         linux/HostHardwareLinux.cpp
     350        src-server/linux/HostHardwareLinux.cpp
    351351
    352352VBoxSVC_SOURCES.solaris = \
    353         linux/vbox-libhal.cpp \
    354         solaris/DynLoadLibSolaris.cpp
     353        src-server/linux/vbox-libhal.cpp \
     354        src-server/solaris/DynLoadLibSolaris.cpp
    355355
    356356VBoxSVC_SOURCES.freebsd = \
    357         freebsd/HostHardwareFreeBSD.cpp
     357        src-server/freebsd/HostHardwareFreeBSD.cpp
    358358
    359359ifdef VBOX_WITH_USB
    360360 ifdef VBOX_WITH_SYSFS_BY_DEFAULT
    361   linux/USBProxyServiceLinux.cpp_DEFS += VBOX_WITH_SYSFS_BY_DEFAULT
     361  src-server/linux/USBProxyServiceLinux.cpp_DEFS += VBOX_WITH_SYSFS_BY_DEFAULT
    362362 endif
    363363 VBoxSVC_SOURCES  += \
    364         USBDeviceFilterImpl.cpp \
    365         USBProxyService.cpp \
    366         HostUSBDeviceImpl.cpp
    367  VBoxSVC_SOURCES.darwin  +=  darwin/USBProxyServiceDarwin.cpp
    368  VBoxSVC_SOURCES.linux   +=   linux/USBProxyServiceLinux.cpp
    369  VBoxSVC_SOURCES.linux   +=   linux/USBGetDevices.cpp
    370  VBoxSVC_SOURCES.os2     +=     os2/USBProxyServiceOs2.cpp
    371  VBoxSVC_SOURCES.solaris += solaris/USBProxyServiceSolaris.cpp
    372  VBoxSVC_SOURCES.win     +=     win/USBProxyServiceWindows.cpp
    373  VBoxSVC_SOURCES.freebsd += freebsd/USBProxyServiceFreeBSD.cpp
     364        src-server/USBDeviceFilterImpl.cpp \
     365        src-server/USBProxyService.cpp \
     366        src-server/HostUSBDeviceImpl.cpp
     367 VBoxSVC_SOURCES.darwin  +=  src-server/darwin/USBProxyServiceDarwin.cpp
     368 VBoxSVC_SOURCES.linux   +=   src-server/linux/USBProxyServiceLinux.cpp
     369 VBoxSVC_SOURCES.linux   +=   src-server/linux/USBGetDevices.cpp
     370 VBoxSVC_SOURCES.os2     +=     src-server/os2/USBProxyServiceOs2.cpp
     371 VBoxSVC_SOURCES.solaris += src-server/solaris/USBProxyServiceSolaris.cpp
     372 VBoxSVC_SOURCES.win     +=     src-server/win/USBProxyServiceWindows.cpp
     373 VBoxSVC_SOURCES.freebsd += src-server/freebsd/USBProxyServiceFreeBSD.cpp
    374374endif
    375375
    … …  
    380380 #       Since this is potentially risky, restrict it to the source file
    381381 #       needing it.
    382  win/NetIf-win.cpp_INCS.win += $(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)
     382 src-server/win/NetIf-win.cpp_INCS.win += $(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)
    383383 VBoxSVC_LIBS.win += \
    384384        $(PATH_LIB)/WinNetConfig.lib \
    … …  
    401401ifdef VBOX_WITH_RESOURCE_USAGE_API
    402402 VBoxSVC_SOURCES += \
    403         PerformanceImpl.cpp \
    404         Performance.cpp
    405  VBoxSVC_SOURCES.darwin  +=  darwin/PerformanceDarwin.cpp
    406  VBoxSVC_SOURCES.freebsd += freebsd/PerformanceFreeBSD.cpp
    407  VBoxSVC_SOURCES.linux   +=   linux/PerformanceLinux.cpp
    408  VBoxSVC_SOURCES.os2     +=     os2/PerformanceOs2.cpp
    409  VBoxSVC_SOURCES.solaris += solaris/PerformanceSolaris.cpp
    410  VBoxSVC_SOURCES.win     +=     win/PerformanceWin.cpp
     403        src-server/PerformanceImpl.cpp \
     404        src-server/Performance.cpp
     405 VBoxSVC_SOURCES.darwin  +=  src-server/darwin/PerformanceDarwin.cpp
     406 VBoxSVC_SOURCES.freebsd += src-server/freebsd/PerformanceFreeBSD.cpp
     407 VBoxSVC_SOURCES.linux   +=   src-server/linux/PerformanceLinux.cpp
     408 VBoxSVC_SOURCES.os2     +=     src-server/os2/PerformanceOs2.cpp
     409 VBoxSVC_SOURCES.solaris += src-server/solaris/PerformanceSolaris.cpp
     410 VBoxSVC_SOURCES.win     +=     src-server/win/PerformanceWin.cpp
    411411 VBoxSVC_LDFLAGS.darwin  += -lproc
    412412 VBoxSVC_LDFLAGS.solaris += -lkstat
    … …  
    415415
    416416ifdef VBOX_WITH_HOSTNETIF_API
    417  VBoxSVC_SOURCES.win     +=     win/NetIf-win.cpp
    418  VBoxSVC_SOURCES.linux   +=   linux/NetIf-linux.cpp
    419  VBoxSVC_SOURCES.os2     +=     os2/NetIf-os2.cpp
    420  VBoxSVC_SOURCES.darwin  +=  darwin/NetIf-darwin.cpp
    421  VBoxSVC_SOURCES.solaris += solaris/NetIf-solaris.cpp
    422  VBoxSVC_SOURCES.freebsd += freebsd/NetIf-freebsd.cpp
     417 VBoxSVC_SOURCES.win     +=     src-server/win/NetIf-win.cpp
     418 VBoxSVC_SOURCES.linux   +=   src-server/linux/NetIf-linux.cpp
     419 VBoxSVC_SOURCES.os2     +=     src-server/os2/NetIf-os2.cpp
     420 VBoxSVC_SOURCES.darwin  +=  src-server/darwin/NetIf-darwin.cpp
     421 VBoxSVC_SOURCES.solaris += src-server/solaris/NetIf-solaris.cpp
     422 VBoxSVC_SOURCES.freebsd += src-server/freebsd/sNetIf-freebsd.cpp
    423423 VBoxSVC_DEFS            += VBOX_WITH_HOSTNETIF_API
    424424 if1of ($(KBUILD_TARGET), linux darwin solaris freebsd)
    425   VBoxSVC_SOURCES        += generic/NetIf-generic.cpp
     425  VBoxSVC_SOURCES        += src-server/generic/NetIf-generic.cpp
    426426 endif
    427427endif
    428428
    429 win/VBoxSVC.rc_INCS  = $(PATH_VBoxSVC)
    430 win/VBoxSVC.rc_DEPS  = $(PATH_VBoxSVC)/VBoxSVC.rgs $(PATH_VBoxSVC)/VBoxSVC-icon.rc
    431 win/VBoxSVC.rc_CLEAN = $(PATH_VBoxSVC)/VBoxSVC.rgs $(PATH_VBoxSVC)/VBoxSVC-icon.rc
     429src-server/win/VBoxSVC.rc_INCS  = $(PATH_VBoxSVC)
     430src-server/win/VBoxSVC.rc_DEPS  = $(PATH_VBoxSVC)/VBoxSVC.rgs $(PATH_VBoxSVC)/VBoxSVC-icon.rc
     431src-server/win/VBoxSVC.rc_CLEAN = $(PATH_VBoxSVC)/VBoxSVC.rgs $(PATH_VBoxSVC)/VBoxSVC-icon.rc
    432432
    433433$$(PATH_VBoxSVC)/VBoxSVC-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$(@D))
    434434        $(APPEND) -t $@ '1 ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
    435435
    436 $$(PATH_VBoxSVC)/VBoxSVC.rgs: $(VBOX_PATH_MAIN_SRC)/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(dir $$(@D))
     436$$(PATH_VBoxSVC)/VBoxSVC.rgs: $(VBOX_PATH_MAIN_SRC)/src-server/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(dir $$(@D))
    437437        $(VBOX_XSLTPROC) --stringparam Module VBoxSVC -o $@ $< $(VBOX_XIDL_FILE)
    438438
    … …  
    501501  PROGRAMS += VBoxTestOGL
    502502  VBoxTestOGL_TEMPLATE = $(if $(VBOX_WITH_VIDEOHWACCEL),$(if $(VBOX_WITH_HARDENING),VBOXQT4GUI,VBOXQT4GUIEXE),VBOXMAINEXE)
    503   VBoxTestOGL_SOURCES = generic/OpenGLTestApp.cpp
     503  VBoxTestOGL_SOURCES = src-server/generic/OpenGLTestApp.cpp
    504504  VBoxTestOGL_LIBS = \
    505505        $(if $(VBOX_WITH_CROGL), \
    … …  
    516516   VBoxTestOGL_QT_MODULES += Core Gui OpenGL
    517517   VBoxTestOGL_LDFLAGS.darwin += -framework OpenGL
    518    VBoxTestOGL_LIBS.win     += $(PATH_SDK_WINPSDK_LIB)/Opengl32.lib
     518   VBoxTestOGL_LIBS.win += $(PATH_SDK_WINPSDK_LIB)/Opengl32.lib
    519519   if1of ($(KBUILD_TARGET), solaris linux freebsd)
    520520    # must come after VBoxOGL2D, therefore don't set the arch-specific LIBS variable here!
    … …  
    543543VBoxSVCM_INTERMEDIATES  = $(VBOX_MAIN_PREREQS)
    544544VBoxSVCM_SOURCES        = \
    545         xpcom/server_module.cpp
     545        src-server/xpcom/server_module.cpp
    546546VBoxSVCM_LDFLAGS.darwin = \
    547547        -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/components/VBoxSVCM.dylib \
    … …  
    624624
    625625VBoxC_SOURCES = \
    626         Global.cpp \
    627         Logging.cpp \
    628         USBDeviceImpl.cpp \
    629         RemoteUSBDeviceImpl.cpp \
    630         VirtualBoxBase.cpp \
    631         VirtualBoxErrorInfoImpl.cpp \
    632         VirtualBoxClientImpl.cpp \
    633         ProgressImpl.cpp \
    634         SharedFolderImpl.cpp \
    635         SessionImpl.cpp \
    636         ConsoleImpl.cpp \
    637         ConsoleImpl2.cpp \
    638         ConsoleImplTeleporter.cpp \
    639         ConsoleVRDPServer.cpp \
    640         GuestImpl.cpp \
    641         GuestCtrlImpl.cpp \
    642         KeyboardImpl.cpp \
    643         MouseImpl.cpp \
    644         DisplayImpl.cpp \
    645         DisplayUtils.cpp \
    646         DisplayPNGUtil.cpp \
    647         DisplayResampleImage.cpp \
    648         MachineDebuggerImpl.cpp \
    649         VBoxDriversRegister.cpp \
    650         AudioSnifferInterface.cpp \
    651         VMMDevInterface.cpp \
    652         EventImpl.cpp \
    653         BusAssignmentManager.cpp \
    654         PciDeviceAttachmentImpl.cpp \
     626        src-all/DisplayPNGUtil.cpp \
     627        src-all/DisplayResampleImage.cpp \
     628        src-all/DisplayUtils.cpp \
     629        src-all/EventImpl.cpp \
     630        src-all/Global.cpp \
     631        src-all/Logging.cpp \
     632        src-all/PciDeviceAttachmentImpl.cpp \
     633        src-all/ProgressImpl.cpp \
     634        src-all/SharedFolderImpl.cpp \
     635        src-all/VirtualBoxBase.cpp \
     636        src-all/VirtualBoxErrorInfoImpl.cpp \
     637        $(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \
     638        src-client/AudioSnifferInterface.cpp \
     639        src-client/BusAssignmentManager.cpp \
     640        src-client/ConsoleImpl.cpp \
     641        src-client/ConsoleImpl2.cpp \
     642        src-client/ConsoleImplTeleporter.cpp \
     643        src-client/ConsoleVRDPServer.cpp \
     644        src-client/DisplayImpl.cpp \
     645        src-client/GuestCtrlImpl.cpp \
     646        src-client/GuestImpl.cpp \
     647        src-client/KeyboardImpl.cpp \
     648        src-client/MachineDebuggerImpl.cpp \
     649        src-client/MouseImpl.cpp \
     650        src-client/RemoteUSBDeviceImpl.cpp \
     651        src-client/SessionImpl.cpp \
     652        src-client/USBDeviceImpl.cpp \
     653        src-client/VBoxDriversRegister.cpp \
     654        src-client/VirtualBoxClientImpl.cpp \
     655        src-client/VMMDevInterface.cpp \
    655656        $(VBOX_AUTOGEN_EVENT_CPP) \
    656         $(VBOX_XML_SCHEMADEFS_CPP) \
    657         $(if $(VBOX_WITH_EXTPACK),ExtPackManagerImpl.cpp ExtPackUtil.cpp,)
     657        $(VBOX_XML_SCHEMADEFS_CPP)
    658658VBoxC_SOURCES.win = \
    659         win/dllmain.cpp \
    660         win/VBoxC.def \
    661         win/VBoxC.rc
     659        src-client/win/dllmain.cpp \
     660        src-client/win/VBoxC.def \
     661        src-client/win/VBoxC.rc
    662662
    663663
    664664ifdef VBOX_WITH_XPCOM
    665665VBoxC_SOURCES += \
    666         xpcom/module.cpp
     666        src-client/xpcom/module.cpp
    667667endif
    668668
    669669ifdef VBOX_WITH_HGCM
    670670VBoxC_SOURCES += \
    671         hgcm/HGCMObjects.cpp \
    672         hgcm/HGCMThread.cpp \
    673         hgcm/HGCM.cpp
     671        src-client/HGCMObjects.cpp \
     672        src-client/HGCMThread.cpp \
     673        src-client/HGCM.cpp
    674674endif
    675675
    … …  
    680680ifdef VBOX_WITH_USB
    681681VBoxC_SOURCES += \
    682         RemoteUSBBackend.cpp
     682        src-client/RemoteUSBBackend.cpp
    683683endif
    684684
    … …  
    692692endif
    693693
    694 ConsoleImpl.cpp_DEFS = \
     694src-client/ConsoleImpl.cpp_DEFS = \
    695695        VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" \
    696696        $(if $(VBOX_BLEEDING_EDGE),VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\",)
    697697
    698698
    699 win/VBoxC.rc_DEPS = $(PATH_VBoxC)/VBoxC.rgs $(PATH_VBoxCOM)/VirtualBox.tlb
     699src-client/win/VBoxC.rc_DEPS = $(PATH_VBoxC)/VBoxC.rgs $(PATH_VBoxCOM)/VirtualBox.tlb
    700700VBoxC_CLEAN.win  += $(PATH_VBoxC)/VBoxC.rgs
    701701
    702 $$(PATH_VBoxC)/VBoxC.rgs: $(VBOX_PATH_MAIN_SRC)/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(PATH_VBoxC)/
     702$$(PATH_VBoxC)/VBoxC.rgs: $(VBOX_PATH_MAIN_SRC)/src-client/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(PATH_VBoxC)/
    703703        $(VBOX_XSLTPROC) --stringparam Module VBoxC -o $@ $< $(VBOX_XIDL_FILE)
    704704
    … …  
    728728else # !win
    729729 VBoxCOM_SOURCES       += \
    730         xpcom/helpers.cpp
     730        glue/xpcom/helpers.cpp
    731731endif # !win
    732732
    … …  
    741741 VBoxExtPackHelperApp_LDFLAGS.win = /SUBSYSTEM:windows
    742742 VBoxExtPackHelperApp_SOURCES = \
    743         VBoxExtPackHelperApp.cpp \
    744         ExtPackUtil.cpp
     743        src-helper-apps/VBoxExtPackHelperApp.cpp \
     744        src-all/ExtPackUtil.cpp
    745745 VBoxExtPackHelperApp_LIBS = \
    746746        $(LIB_RUNTIME)
    … …  
    785785
    786786## @todo this hack ain't cutting it any longer. (the file name is abspath'ed since ages now.)
    787 xpcom/helpers.cpp: $(VBOX_IDL_TYPELIB.XPCOM)
     787glue/xpcom/helpers.cpp: $(VBOX_IDL_TYPELIB.XPCOM)
    788788
    789789$(VBOX_IDL_FILE.XPCOM): $(VBOX_PATH_MAIN_SRC)/idl/xpidl.xsl $(VBOX_XIDL_FILE) | $$(dir $$@)

  • trunk/src/VBox/Main/src-all/ExtPackUtil.cpp

    r35363 r35368  
    2020*   Header Files                                                               *
    2121*******************************************************************************/
    22 #include "include/ExtPackUtil.h"
     22#include "../include/ExtPackUtil.h"
    2323
    2424#include <iprt/ctype.h>

  • trunk/src/VBox/Main/src-client/win/VBoxC.rc

    r35364 r35368  
    1919#include <VBox/version.h>
    2020
    21 #include "resource.h"
     21#include "win/resource.h"
    2222
    2323VS_VERSION_INFO    VERSIONINFO

  • trunk/src/VBox/Main/src-server/win/VBoxSVC.rc

    r35364 r35368  
    1919#include <VBox/version.h>
    2020
    21 #include "resource.h"
     21#include "win/resource.h"
    2222
    2323VS_VERSION_INFO    VERSIONINFO

  • trunk/src/VBox/Main/src-server/xpcom/server.cpp

    r35364 r35368  
    3131#include "prproces.h"
    3232
    33 #include "xpcom/server.h"
     33#include "server.h"
    3434
    3535#include "Logging.h"

  • trunk/src/VBox/Main/src-server/xpcom/server_module.cpp

    r35364 r35368  
    4444#include <VirtualBox_XPCOM.h>
    4545
    46 #include "xpcom/server.h"
     46#include "server.h"
    4747#include "Logging.h"
    4848

  • trunk/src/VBox/Main/testcase/Makefile.kmk

    r32324 r35368  
    136136tstCollector_SOURCES  = \
    137137        tstCollector.cpp \
    138         ../Performance.cpp
     138        ../src-server/Performance.cpp
    139139tstCollector_INCS     = ../include
    140140tstCollector_DEFS    += VBOX_COLLECTOR_TEST_CASE
    … …  
    151151tstHostHardwareLinux_SOURCES   = \
    152152        tstHostHardwareLinux.cpp \
    153         ../linux/HostHardwareLinux.cpp \
    154         ../linux/USBGetDevices.cpp
     153        ../src-server/linux/HostHardwareLinux.cpp \
     154        ../src-server/linux/USBGetDevices.cpp
    155155tstHostHardwareLinux_INCS      = . ../include
    156156tstHostHardwareLinux_DEFS      = \

  • trunk/src/VBox/Main/testcase/tstCollector.cpp

    r28800 r35368  
    1919
    2020#ifdef RT_OS_DARWIN
    21 #include "../darwin/PerformanceDarwin.cpp"
     21# include "../src-server/darwin/PerformanceDarwin.cpp"
    2222#endif
    2323#ifdef RT_OS_FREEBSD
    24 #include "../freebsd/PerformanceFreeBSD.cpp"
     24# include "../src-server/freebsd/PerformanceFreeBSD.cpp"
    2525#endif
    2626#ifdef RT_OS_LINUX
    27 #include "../linux/PerformanceLinux.cpp"
     27# include "../src-server/linux/PerformanceLinux.cpp"
    2828#endif
    2929#ifdef RT_OS_OS2
    30 #include "../os2/PerformanceOS2.cpp"
     30# include "../src-server/os2/PerformanceOS2.cpp"
    3131#endif
    3232#ifdef RT_OS_SOLARIS
    33 #include "../solaris/PerformanceSolaris.cpp"
     33# include "../src-server/solaris/PerformanceSolaris.cpp"
    3434#endif
    3535#ifdef RT_OS_WINDOWS
    36 #define _WIN32_DCOM
    37 #include <objidl.h>
    38 #include <objbase.h>
    39 #include "../win/PerformanceWin.cpp"
     36# define _WIN32_DCOM
     37# include <objidl.h>
     38# include <objbase.h>
     39# include "../src-server/win/PerformanceWin.cpp"
    4040#endif
    4141

  • trunk/src/VBox/RDP/client/Makefile.kmk

    r32472 r35368  
    2323VBOX_PATH_DEVICES_USB  := $(PATH_ROOT)/src/VBox/Devices/USB
    2424VBOX_PATH_USB_LIB      := $(PATH_ROOT)/src/VBox/HostDrivers/VBoxUSB
    25 VBOX_PATH_MAIN_LINUX   := $(PATH_ROOT)/src/VBox/Main/linux
     25VBOX_PATH_MAIN_LINUX   := $(PATH_ROOT)/src/VBox/Main/src-server/linux
    2626VBOX_PATH_MAIN_INCLUDE := $(PATH_ROOT)/src/VBox/Main/include
    2727VBOX_RDESKTOP_SRC_SUBDIR = rdesktop-1.6.0-vrdp

  • trunk/src/VBox/RDP/client/files_rdesktop-vrdp

    r32472 r35368  
    1515# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1616#
     17
     18## @todo r=bird: Why is this in a separate file when only the Makefile.kmk is referring it?
    1719
    1820rdesktop-nonbin_SOURCES = \
    … …  
    6769        $(PATH_ROOT)/src/VBox/Main/include/USBGetDevices.h=>vrdp/USBGetDevices.h \
    6870        $(PATH_ROOT)/src/VBox/Main/include/vector.h=>vrdp/vector.h \
    69         $(PATH_ROOT)/src/VBox/Main/linux/USBGetDevices.cpp=>vrdp/USBGetDevices.cpp \
     71        $(PATH_ROOT)/src/VBox/Main/src-server/linux/USBGetDevices.cpp=>vrdp/USBGetDevices.cpp \
    7072        $(PATH_ROOT)/src/VBox/RDP/client/bitmap.c=>bitmap.c \
    7173        $(PATH_ROOT)/src/VBox/RDP/client/bootstrap=>bootstrap \
    … …  
    233235        $(PATH_ROOT)/src/VBox/Runtime/r3/posix/utf8-posix.cpp=>Runtime/r3/posix/utf8-posix.cpp \
    234236        $(PATH_ROOT)/src/VBox/Runtime/r3/stream.cpp=>Runtime/r3/stream.cpp
     237
Note: See TracChangeset for help on using the changeset viewer.

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