VirtualBox

Changeset 84480 in vbox for trunk/src


Ignore:
Timestamp:
May 25, 2020 7:41:16 AM (5 years ago)
Author:
vboxsync
Message:

bugref:9637. Revert some changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

    r84479 r84480  
    2626#
    2727PROGRAMS += VBoxClient
    28 PROGRAMS += VBoxWaylandClient
    2928
    3029VBoxClient_TEMPLATE = NewVBoxGuestR3Exe
    … …  
    4140VBoxClient_INCS += ../x11include/randrproto-1.6.0
    4241VBoxClient_SOURCES = \
    43         main.cpp \
    44         display-svga.cpp \
    45         display-svga-x11.cpp \
    46         seamless.cpp \
    47         seamless-x11.cpp \
    48         hostversion.cpp
    49 
    50 VBoxWaylandClient_SOURCES = \
    51         display-wayland.cpp
     42        main.cpp \
     43        display-svga.cpp \
     44        display-svga-x11.cpp \
     45        seamless.cpp \
     46        seamless-x11.cpp \
     47        hostversion.cpp
    5248
    5349VBoxClient_SOURCES.linux = \
    54         chk_stubs.c
     50        chk_stubs.c
    5551VBoxClient_LIBPATH = \
    56         $(VBOX_LIBPATH32_X11)
     52        $(VBOX_LIBPATH32_X11)
    5753VBoxClient_LIBS.freebsd = \
    58         iconv
     54        iconv
    5955VBoxClient_LIBS.linux = \
    60         dl
     56        dl
    6157VBoxClient_LIBS.netbsd = \
    62         crypt
     58        crypt
    6359VBoxClient_LIBS.solaris = \
    64         dl
     60        dl
    6561VBoxClient_LIBS = \
    66         X11 Xt Xext Xmu
     62        X11 Xt Xext Xmu
    6763ifdef VBOX_WITH_DISTRO_XRAND_XINERAMA
    6864 VBoxClient_DEFS += WITH_DISTRO_XRAND_XINERAMA
    … …  
    7268# XXX: -L comes from the template, but not rpath
    7369VBoxClient_LDFLAGS.netbsd = \
    74         -Wl,-rpath /usr/X11R7/lib
     70        -Wl,-rpath /usr/X11R7/lib
    7571
    7672ifdef VBOX_WITH_DRAG_AND_DROP
    … …  
    7874 VBoxClient_DEFS += VBOX_DND_WITH_XTEST
    7975 VBoxClient_LIBS += \
    80         Xtst
     76        Xtst
    8177 endif
    8278endif
    … …  
    8783ifeq ($(KBUILD_TARGET),linux)
    8884VBoxClient_LDFLAGS.amd64 += \
    89         -Wl,--wrap=memcpy
     85        -Wl,--wrap=memcpy
    9086endif
    9187
    … …  
    9692ifdef VBOX_WITH_DRAG_AND_DROP
    9793VBoxClient_DEFS += \
    98         VBOX_WITH_DRAG_AND_DROP \
    99         $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
     94        VBOX_WITH_DRAG_AND_DROP \
     95        $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
    10096VBoxClient_SOURCES += \
    101         draganddrop.cpp
     97        draganddrop.cpp
    10298VBoxClient_LIBS     += \
    103         $(VBOX_LIB_VBGL_R3) \
    104         $(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)
     99        $(VBOX_LIB_VBGL_R3) \
     100        $(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)
    105101endif
    106102
    107103ifdef VBOX_WITH_SHARED_CLIPBOARD
    108104 VBoxClient_DEFS += \
    109         VBOX_WITH_SHARED_CLIPBOARD \
    110         $(if $(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS),VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS,)
     105        VBOX_WITH_SHARED_CLIPBOARD \
     106        $(if $(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS),VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS,)
    111107 VBoxClient_SOURCES += \
    112         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
    113         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
    114         clipboard.cpp
     108        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
     109        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
     110        clipboard.cpp
    115111 ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    116112  VBoxClient_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_GUEST
    117113  VBoxClient_SOURCES += \
    118         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp \
    119         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp
     114        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp \
     115        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp
    120116  ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
    121117   VBoxClient_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_FUSE
    122118   # @todo Make this dynamic loading more generic.
    123119   VBoxClient_SOURCES += \
    124         $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount/fuse.cpp \
    125         clipboard-fuse.cpp
     120        $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount/fuse.cpp \
     121        clipboard-fuse.cpp
    126122   # @todo Ditto.
    127123   VBoxClient_INCS    += \
    128         $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount
     124        $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount
    129125  endif
    130126 endif
    … …  
    150146$$(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run: \
    151147       $$(tstSeamlessX11-auto_1_STAGE_TARGET)
    152         export VBOX_LOG_DEST=nofile; $(tstSeamlessX11-auto_1_STAGE_TARGET) quiet
    153         $(QUIET)$(APPEND) -t "$@" "done"
     148        export VBOX_LOG_DEST=nofile; $(tstSeamlessX11-auto_1_STAGE_TARGET) quiet
     149        $(QUIET)$(APPEND) -t "$@" "done"
    154150
    155151  #
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