VirtualBox

Changeset 98214 in vbox for trunk


Ignore:
Timestamp:
Jan 22, 2023 6:31:07 PM (21 months ago)
Author:
vboxsync
Message:

*.kmk: s/VBOXGUESTR3XF86MOD/VBoxGuestR3XFree86Mod/ s/VBOXGUESTR3XF86LIB/VBoxGuestR3XFree86Lib/ s/VBOXGUESTR3XORGMOD/VBoxGuestR3XOrgMod/ s/VBOXGUESTR3XORGLIB/VBoxGuestR3XOrgLib/ bugref:10348

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r98213 r98214  
    86288628# This mostly about zapping the VBoxR3Exe linker flags and libraries.
    86298629#
    8630 TEMPLATE_VBOXGUESTR3XF86MOD         := VBox XFree86 Guest Module
    8631 TEMPLATE_VBOXGUESTR3XF86MOD_EXTENDS := VBoxGuestR3ExeBase
    8632 TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF := .o
    8633 TEMPLATE_VBOXGUESTR3XF86MOD_DEFS     = $(TEMPLATE_VBoxGuestR3ExeBase_DEFS) VBOX_GUESTR3XF86MOD RTMEM_NO_WRAP_TO_EF_APIS
    8634 TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS   = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3ExeBase_CFLAGS)) \
     8630TEMPLATE_VBoxGuestR3XFree86Mod         := VBox XFree86 Guest Module
     8631TEMPLATE_VBoxGuestR3XFree86Mod_EXTENDS := VBoxGuestR3ExeBase
     8632TEMPLATE_VBoxGuestR3XFree86Mod_SYSSUFF := .o
     8633TEMPLATE_VBoxGuestR3XFree86Mod_DEFS     = $(TEMPLATE_VBoxGuestR3ExeBase_DEFS) VBOX_GUESTR3XF86MOD RTMEM_NO_WRAP_TO_EF_APIS
     8634TEMPLATE_VBoxGuestR3XFree86Mod_CFLAGS   = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3ExeBase_CFLAGS)) \
    86358635        -fno-pie -fno-merge-constants -std=c99 -ffreestanding
    8636 TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3ExeBase_CXXFLAGS)) \
     8636TEMPLATE_VBoxGuestR3XFree86Mod_CXXFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3ExeBase_CXXFLAGS)) \
    86378637        -fno-pie -fno-merge-constants -ffreestanding
    8638 TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS.linux             = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h
    8639 TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS.linux           = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h
    8640 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
     8638TEMPLATE_VBoxGuestR3XFree86Mod_CFLAGS.linux             = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h
     8639TEMPLATE_VBoxGuestR3XFree86Mod_CXXFLAGS.linux           = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h
     8640TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
    86418641# The GNU_HASH ELF tag is not supported by older glibc dynamic linkers.
    8642 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.linux            = $(subst -Wl$(COMMA),,$(VBOX_LD_hash_style_sysv))
    8643 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TYPE)   = $(NO_SUCH_VARIABLE)
    8644 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS                 := -r
     8642TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.linux            = $(subst -Wl$(COMMA),,$(VBOX_LD_hash_style_sysv))
     8643TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.$(KBUILD_TYPE)   = $(NO_SUCH_VARIABLE)
     8644TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS                 := -r
    86458645if1of ($(KBUILD_TARGET), dragonfly freebsd linux netbsd openbsd) # the gnu ld guys.
    8646  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release        := -S
    8647  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86            := -m elf_i386
    8648  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64          := -m elf_x86_64
    8649 endif
    8650 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS                     = $(VBOX_LIB_VBGL_R3_XFREE86)
    8651 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TYPE)      = $(NO_SUCH_VARIABLE)
    8652 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET)    = $(NO_SUCH_VARIABLE)
     8646 TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.release        := -S
     8647 TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.x86            := -m elf_i386
     8648 TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.amd64          := -m elf_x86_64
     8649endif
     8650TEMPLATE_VBoxGuestR3XFree86Mod_LIBS                     = $(VBOX_LIB_VBGL_R3_XFREE86)
     8651TEMPLATE_VBoxGuestR3XFree86Mod_LIBS.$(KBUILD_TYPE)      = $(NO_SUCH_VARIABLE)
     8652TEMPLATE_VBoxGuestR3XFree86Mod_LIBS.$(KBUILD_TARGET)    = $(NO_SUCH_VARIABLE)
    86538653
    86548654
     
    86568656# Template for XFree86 guest libraries.
    86578657#
    8658 TEMPLATE_VBOXGUESTR3XF86LIB         := VBox XFree86 Guest Library
    8659 TEMPLATE_VBOXGUESTR3XF86LIB_EXTENDS := VBOXGUESTR3XF86MOD
    8660 TEMPLATE_VBOXGUESTR3XF86LIB_INST     = $(INST_ADDITIONS_LIB)
    8661 
    8662 
    8663 #
    8664 # Template for X.org guest modules (shared libs).
     8658TEMPLATE_VBoxGuestR3XFree86Lib         := VBox XFree86 Guest Library
     8659TEMPLATE_VBoxGuestR3XFree86Lib_EXTENDS := VBoxGuestR3XFree86Mod
     8660TEMPLATE_VBoxGuestR3XFree86Lib_INST     = $(INST_ADDITIONS_LIB)
     8661TEMPLATE_VBoxGuestR3XFree86Lib_LIBS     = $(INST_ADDITIONS_LIB)
     8662
     8663
     8664#
     8665# Template for X.Org guest modules (shared libs).
    86658666# This mostly about zapping unnecessary LIBS from VBoxGuestR3DllNonPedantic and adding some flags.
    86668667#
    8667 TEMPLATE_VBOXGUESTR3XORGMOD         := VBox X.org Guest Module
    8668 TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS := VBoxGuestR3DllNonPedantic
    8669 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS     = $(TEMPLATE_VBoxGuestR3DllNonPedantic_DEFS) VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS
     8668TEMPLATE_VBoxGuestR3XOrgMod         := VBox X.Org Guest Module
     8669TEMPLATE_VBoxGuestR3XOrgMod_EXTENDS := VBoxGuestR3DllNonPedantic
     8670TEMPLATE_VBoxGuestR3XOrgMod_DEFS     = $(TEMPLATE_VBoxGuestR3DllNonPedantic_DEFS) VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS
    86708671ifeq ($(KBUILD_TARGET_ARCH),amd64)
    8671  TEMPLATE_VBOXGUESTR3XORGMOD_DEFS   += _XSERVER64
    8672 endif
    8673 TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS   = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_CFLAGS)) -std=c99
    8674 TEMPLATE_VBOXGUESTR3XORGMOD_CXXFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_CXXFLAGS))
     8672 TEMPLATE_VBoxGuestR3XOrgMod_DEFS   += _XSERVER64
     8673endif
     8674TEMPLATE_VBoxGuestR3XOrgMod_CFLAGS   = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_CFLAGS)) -std=c99
     8675TEMPLATE_VBoxGuestR3XOrgMod_CXXFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_CXXFLAGS))
    86758676if1of ($(KBUILD_TARGET), linux)
    8676  TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS += -Wno-conversion -Wno-unused-parameter
    8677 endif
    8678 TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS  = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_LDFLAGS))
    8679 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS                    = $(VBOX_LIB_VBGL_R3_XORG)
    8680 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE)     = $(NO_SUCH_VARIABLE)
    8681 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET)   = $(NO_SUCH_VARIABLE)
    8682 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.freebsd           += iconv
     8677 TEMPLATE_VBoxGuestR3XOrgMod_CFLAGS += -Wno-conversion -Wno-unused-parameter
     8678endif
     8679TEMPLATE_VBoxGuestR3XOrgMod_LDFLAGS  = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_LDFLAGS))
     8680TEMPLATE_VBoxGuestR3XOrgMod_LIBS                    = $(VBOX_LIB_VBGL_R3_XORG)
     8681TEMPLATE_VBoxGuestR3XOrgMod_LIBS.$(KBUILD_TYPE)     = $(NO_SUCH_VARIABLE)
     8682TEMPLATE_VBoxGuestR3XOrgMod_LIBS.$(KBUILD_TARGET)   = $(NO_SUCH_VARIABLE)
     8683TEMPLATE_VBoxGuestR3XOrgMod_LIBS.freebsd           += iconv
    86838684
    86848685
     
    86868687# Template for X.Org guest libraries.
    86878688#
    8688 TEMPLATE_VBOXGUESTR3XORGLIB         := VBox X.Org Guest Library
    8689 TEMPLATE_VBOXGUESTR3XORGLIB_EXTENDS := VBOXGUESTR3XORGMOD
    8690 TEMPLATE_VBOXGUESTR3XORGLIB_INST     = $(INST_ADDITIONS_LIB)
     8689TEMPLATE_VBoxGuestR3XOrgLib         := VBox X.Org Guest Library
     8690TEMPLATE_VBoxGuestR3XOrgLib_EXTENDS := VBoxGuestR3XOrgMod
     8691TEMPLATE_VBoxGuestR3XOrgLib_INST     = $(INST_ADDITIONS_LIB)
    86918692
    86928693
  • trunk/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk

    r98210 r98214  
    210210# C library is not available.
    211211#
    212 VBoxGuestR3LibXFree86_TEMPLATE = VBOXGUESTR3XF86LIB
     212VBoxGuestR3LibXFree86_TEMPLATE = VBoxGuestR3XFree86Lib
    213213VBoxGuestR3LibXFree86_DEFS     = \
    214214        VBOX_WITH_HGCM \
     
    237237# the C server runtime instead of IPRT.
    238238#
    239 VBoxGuestR3LibXOrg_TEMPLATE = VBOXGUESTR3XORGLIB
     239VBoxGuestR3LibXOrg_TEMPLATE = VBoxGuestR3XOrgLib
    240240VBoxGuestR3LibXOrg_DEFS     = \
    241241        VBOX_WITH_HGCM \
  • trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk

    r98103 r98214  
    4141if1of ($(KBUILD_TARGET), linux)
    4242 SYSMODS += vboxmouse_drv
    43  vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
     43 vboxmouse_drv_TEMPLATE = VBoxGuestR3XFree86Mod
    4444 vboxmouse_drv_DEFS.linux = linux
    4545 vboxmouse_drv_DEFS.x86 += __i386__
     
    7676#
    7777DLLS += vboxmouse_drv_70
    78 vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
     78vboxmouse_drv_70_TEMPLATE = VBoxGuestR3XOrgMod
    7979vboxmouse_drv_70_DEFS = \
    8080        XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
     
    9191#
    9292DLLS += vboxmouse_drv_71
    93 vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
     93vboxmouse_drv_71_TEMPLATE = VBoxGuestR3XOrgMod
    9494vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    9595vboxmouse_drv_71_INCS := \
     
    105105#
    106106DLLS += vboxmouse_drv_13
    107 vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
     107vboxmouse_drv_13_TEMPLATE = VBoxGuestR3XOrgMod
    108108vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    109109vboxmouse_drv_13_INCS := \
     
    119119#
    120120DLLS += vboxmouse_drv_14
    121 vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
     121vboxmouse_drv_14_TEMPLATE = VBoxGuestR3XOrgMod
    122122vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    123123vboxmouse_drv_14_INCS := \
     
    133133#
    134134DLLS += vboxmouse_drv_15
    135 vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
     135vboxmouse_drv_15_TEMPLATE = VBoxGuestR3XOrgMod
    136136vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    137137vboxmouse_drv_15_INCS := \
     
    147147#
    148148DLLS += vboxmouse_drv_16
    149 vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
     149vboxmouse_drv_16_TEMPLATE = VBoxGuestR3XOrgMod
    150150vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    151151vboxmouse_drv_16_INCS := \
     
    163163#
    164164DLLS += vboxmouse_drv_17
    165 vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
     165vboxmouse_drv_17_TEMPLATE = VBoxGuestR3XOrgMod
    166166vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    167167vboxmouse_drv_17_INCS := \
     
    177177#
    178178DLLS += vboxmouse_drv_18
    179 vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
     179vboxmouse_drv_18_TEMPLATE = VBoxGuestR3XOrgMod
    180180vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    181181vboxmouse_drv_18_INCS := \
     
    191191#
    192192DLLS += vboxmouse_drv_19
    193 vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
     193vboxmouse_drv_19_TEMPLATE = VBoxGuestR3XOrgMod
    194194vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    195195vboxmouse_drv_19_INCS := \
     
    205205#
    206206DLLS += vboxmouse_drv_110
    207 vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
     207vboxmouse_drv_110_TEMPLATE = VBoxGuestR3XOrgMod
    208208vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    209209vboxmouse_drv_110_INCS := \
     
    215215
    216216DLLS += vboxmouse_drv_111
    217 vboxmouse_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
     217vboxmouse_drv_111_TEMPLATE = VBoxGuestR3XOrgMod
    218218vboxmouse_drv_111_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    219219vboxmouse_drv_111_INCS := \
     
    225225
    226226DLLS += vboxmouse_drv_112
    227 vboxmouse_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
     227vboxmouse_drv_112_TEMPLATE = VBoxGuestR3XOrgMod
    228228vboxmouse_drv_112_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
    229229vboxmouse_drv_112_INCS := \
  • trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

    r98103 r98214  
    5757# vboxvideo_drv_lib
    5858#
    59 vboxvideo_drv_lib_TEMPLATE = VBOXGUESTR3XORGMOD
     59vboxvideo_drv_lib_TEMPLATE = VBoxGuestR3XOrgMod
    6060# We are relying in the include guard in the two headers below to stop the more
    6161# generic ones from being included.  Not very nice, I know.
     
    8888 SYSMODS += vboxvideo_drv
    8989endif   # target linux
    90 vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
     90vboxvideo_drv_TEMPLATE = VBoxGuestR3XFree86Mod
    9191vboxvideo_drv_CFLAGS += $(vboxvideo_override_INCLUDES)
    9292vboxvideo_drv_CFLAGS += -Wno-shadow # Avoid MBs of warnings in X11 and OpenGL headers (solaris mostly).
     
    137137#
    138138DLLS += vboxvideo_drv_70
    139 vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
     139vboxvideo_drv_70_TEMPLATE = VBoxGuestR3XOrgMod
    140140vboxvideo_drv_70_DEFS = $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=70000000
    141141vboxvideo_drv_70_CFLAGS += $(vboxvideo_override_INCLUDES)
     
    155155#
    156156DLLS += vboxvideo_drv_71
    157 vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
     157vboxvideo_drv_71_TEMPLATE = VBoxGuestR3XOrgMod
    158158vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    159159vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=70100000
     
    170170#
    171171DLLS += vboxvideo_drv_13
    172 vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
     172vboxvideo_drv_13_TEMPLATE = VBoxGuestR3XOrgMod
    173173vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    174174vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=10300000
     
    185185#
    186186DLLS += vboxvideo_drv_14
    187 vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
     187vboxvideo_drv_14_TEMPLATE = VBoxGuestR3XOrgMod
    188188vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    189189vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=10400000
     
    200200#
    201201DLLS += vboxvideo_drv_15
    202 vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
     202vboxvideo_drv_15_TEMPLATE = VBoxGuestR3XOrgMod
    203203vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    204204vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10503000
     
    215215#
    216216DLLS += vboxvideo_drv_16
    217 vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
     217vboxvideo_drv_16_TEMPLATE = VBoxGuestR3XOrgMod
    218218vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    219219vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10600000
     
    230230#
    231231DLLS += vboxvideo_drv_17
    232 vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
     232vboxvideo_drv_17_TEMPLATE = VBoxGuestR3XOrgMod
    233233vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    234234vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10699000
     
    245245#
    246246DLLS += vboxvideo_drv_18
    247 vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
     247vboxvideo_drv_18_TEMPLATE = VBoxGuestR3XOrgMod
    248248vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    249249vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10800000
     
    260260#
    261261DLLS += vboxvideo_drv_19
    262 vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
     262vboxvideo_drv_19_TEMPLATE = VBoxGuestR3XOrgMod
    263263vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    264264vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10900000
     
    275275#
    276276DLLS += vboxvideo_drv_110
    277 vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
     277vboxvideo_drv_110_TEMPLATE = VBoxGuestR3XOrgMod
    278278vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    279279vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11000000
     
    290290#
    291291DLLS += vboxvideo_drv_111
    292 vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
     292vboxvideo_drv_111_TEMPLATE = VBoxGuestR3XOrgMod
    293293vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    294294vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11100000
     
    305305#
    306306DLLS += vboxvideo_drv_112
    307 vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
     307vboxvideo_drv_112_TEMPLATE = VBoxGuestR3XOrgMod
    308308vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    309309vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11200000
     
    320320#
    321321DLLS += vboxvideo_drv_113
    322 vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD
     322vboxvideo_drv_113_TEMPLATE = VBoxGuestR3XOrgMod
    323323vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    324324vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11300000
     
    335335#
    336336DLLS += vboxvideo_drv_114
    337 vboxvideo_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD
     337vboxvideo_drv_114_TEMPLATE = VBoxGuestR3XOrgMod
    338338vboxvideo_drv_114_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    339339vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11400000
     
    350350#
    351351DLLS += vboxvideo_drv_115
    352 vboxvideo_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD
     352vboxvideo_drv_115_TEMPLATE = VBoxGuestR3XOrgMod
    353353vboxvideo_drv_115_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    354354vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11500000
     
    365365#
    366366DLLS += vboxvideo_drv_116
    367 vboxvideo_drv_116_TEMPLATE = VBOXGUESTR3XORGMOD
     367vboxvideo_drv_116_TEMPLATE = VBoxGuestR3XOrgMod
    368368vboxvideo_drv_116_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    369369vboxvideo_drv_116_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11600000
     
    380380#
    381381DLLS += vboxvideo_drv_117
    382 vboxvideo_drv_117_TEMPLATE = VBOXGUESTR3XORGMOD
     382vboxvideo_drv_117_TEMPLATE = VBoxGuestR3XOrgMod
    383383vboxvideo_drv_117_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    384384vboxvideo_drv_117_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11700000
     
    395395#
    396396DLLS += vboxvideo_drv_118
    397 vboxvideo_drv_118_TEMPLATE = VBOXGUESTR3XORGMOD
     397vboxvideo_drv_118_TEMPLATE = VBoxGuestR3XOrgMod
    398398vboxvideo_drv_118_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    399399vboxvideo_drv_118_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11800000
     
    409409 DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
    410410 SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
    411  vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
     411 vboxvideo_drv_system_TEMPLATE = VBoxGuestR3XOrgMod
    412412 vboxvideo_drv_system_CFLAGS := \
    413413        $(vboxvideo_drv_70_CFLAGS) -include xorg-server.h
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