VirtualBox

Changeset 75635 in vbox for trunk/src/VBox/Additions/3D


Ignore:
Timestamp:
Nov 21, 2018 10:29:49 AM (6 years ago)
Author:
vboxsync
Message:

Additions/3D/win: makefiles cleanup

Location:
trunk/src/VBox/Additions/3D
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Additions/3D/Config.kmk

    r75456 r75635  
    2020# Include the top-level configure file.
    2121ifndef VBOX_ROOT_CONFIG_KMK_INCLUDED
    22  include $(PATH_ROOT)/Config.kmk
     22include $(PATH_ROOT)/Config.kmk
    2323endif
    2424
     
    3232# Base template for Mesa3D code and code which uses Mesa3D libraries.
    3333#
    34 TEMPLATE_VBOXMESA3DGUESTR3DLL             = VBox Mesa 3D Guest User Mode DLL
    35 TEMPLATE_VBOXMESA3DGUESTR3DLL_EXTENDS     = NewerVccVBoxGuestR3Dll
    36 TEMPLATE_VBOXMESA3DGUESTR3DLL_INST        = $(INST_ADDITIONS)
    37 TEMPLATE_VBOXMESA3DGUESTR3DLL_DEFS        = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS) \
     34TEMPLATE_VBoxMesa3DGuestR3Dll          = VBox Mesa 3D Guest User Mode DLL
     35TEMPLATE_VBoxMesa3DGuestR3Dll_EXTENDS  = NewerVccVBoxGuestR3Dll
     36TEMPLATE_VBoxMesa3DGuestR3Dll_INST     = $(INST_ADDITIONS)
     37TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS     = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS) \
    3838        VBOX_WITH_MESA3D
    39 TEMPLATE_VBOXMESA3DGUESTR3DLL_SDKS.win    = $(TEMPLATE_NewerVccVBoxGuestR3Dll_SDKS) \
     39TEMPLATE_VBoxMesa3DGuestR3Dll_SDKS.win = $(TEMPLATE_NewerVccVBoxGuestR3Dll_SDKS) \
    4040        $(VBOX_WINDDK_GST_W8)
    41 
    4241# VirtualBox specific modifications of the Mesa3D code.
    4342# All modified places can be found by searching for VBOX
     
    6059#  VBOX_WITH_MESA3D_SVGA_INSTANCING    Instancing for DrawPrimitives in the Gallium SVGA driver
    6160#                                      (VGPU9 only, VGPU10 has it).
    62 TEMPLATE_VBOXMESA3DGUESTR3DLL_DEFS      += \
     61TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS    += \
    6362        VBOX_WITH_MESA3D_COMPILE \
    6463        VBOX_WITH_MESA3D_D3D_FROM_SYSTEMMEM \
     
    7170        VBOX_WITH_MESA3D_SVGA_HALFZ \
    7271        VBOX_WITH_MESA3D_SVGA_INSTANCING
    73 
    74 TEMPLATE_VBOXMESA3DGUESTR3DLL_DEFS.win   = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS.win) \
     72TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS.win = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS.win) \
    7573        _USE_MATH_DEFINES \
    7674        WINAPI=__stdcall \
    7775        _WIN32
    78 
    79 TEMPLATE_VBOXMESA3DGUESTR3DLL_INCS       = $(TEMPLATE_NewerVccVBoxGuestR3Dll_INCS) \
     76TEMPLATE_VBoxMesa3DGuestR3Dll_INCS     = $(TEMPLATE_NewerVccVBoxGuestR3Dll_INCS) \
    8077        $(VBOX_PATH_MESA)/include \
    8178        $(VBOX_PATH_MESA)/include/c99 \
     
    8784
    8885#
    89 # Variant of VBOXMESA3DGUESTR3DLL that requires Windows Vista or later.
     86# Variant of VBoxMesa3DGuestR3Dll that requires Windows Vista or later.
    9087#
    91 TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista = VBox Mesa 3D Guest User Mode DLL (Windows Vista or newer)
    92 TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista_EXTENDS  = VBOXMESA3DGUESTR3DLL
     88TEMPLATE_VBoxMesa3DGuestR3DllMinVista                    = VBox Mesa 3D Guest User Mode DLL (Windows Vista or newer)
     89TEMPLATE_VBoxMesa3DGuestR3DllMinVista_EXTENDS             = VBoxMesa3DGuestR3Dll
    9390ifeq ($(KBUILD_TARGET),win)
    94  TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista_LDFLAGS.win.x86 = $(filter-out -Section:.bss$(COMMA)RW!K,$(TEMPLATE_VBOXMESA3DGUESTR3DLL_LDFLAGS.win.x86))
    95  TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista_POST_CMDS.win.x86 = $(subst $(VBOX_PE_SET_VERSION), $(VBOX_PE_SET_VERSION) --vista,$(TEMPLATE_VBOXMESA3DGUESTR3DLL_POST_CMDS.win.x86))
    96  TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista_POST_CMDS.win.amd64 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) --vista $(out)$$(NLTAB)$(TEMPLATE_VBOXMESA3DGUESTR3DLL_POST_CMDS.win.amd64))
    97  TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista_LNK_DEPS.win.amd64  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION)) $(TEMPLATE_VBOXMESA3DGUESTR3DLL_LNK_DEPS.win.amd64)
     91TEMPLATE_VBoxMesa3DGuestR3DllMinVista_LDFLAGS.win.x86     = $(filter-out -Section:.bss$(COMMA)RW!K,$(TEMPLATE_VBoxMesa3DGuestR3Dll_LDFLAGS.win.x86))
     92TEMPLATE_VBoxMesa3DGuestR3DllMinVista_POST_CMDS.win.x86   = $(subst $(VBOX_PE_SET_VERSION), $(VBOX_PE_SET_VERSION) --vista,$(TEMPLATE_VBoxMesa3DGuestR3Dll_POST_CMDS.win.x86))
     93TEMPLATE_VBoxMesa3DGuestR3DllMinVista_POST_CMDS.win.amd64 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) --vista $(out)$$(NLTAB)$(TEMPLATE_VBoxMesa3DGuestR3Dll_POST_CMDS.win.amd64))
     94TEMPLATE_VBoxMesa3DGuestR3DllMinVista_LNK_DEPS.win.amd64  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION)) $(TEMPLATE_VBoxMesa3DGuestR3Dll_LNK_DEPS.win.amd64)
    9895endif
     96
  • trunk/src/VBox/Additions/3D/Makefile.kmk

    r75443 r75635  
    2323#
    2424ifndef VBOX_MESA3D_CONFIG_KMK_INCLUDED
    25  include $(PATH_SUB_CURRENT)/Config.kmk
     25include $(PATH_SUB_CURRENT)/Config.kmk
    2626endif
    2727
     
    3131include $(PATH_SUB_CURRENT)/mesa/Makefile.kmk
    3232if1of ($(KBUILD_TARGET), win)
    33  include $(PATH_SUB_CURRENT)/win/Makefile.kmk
     33include $(PATH_SUB_CURRENT)/win/Makefile.kmk
    3434endif
    3535
  • trunk/src/VBox/Additions/3D/mesa/Makefile.kmk

    r75456 r75635  
    2222# Target lists.
    2323#
    24 #VBOX_PATH_MESA_GENFILES = $(PATH_OBJ)/VBoxMesaGen
    25 #BLDDIRS   += \
    26 #       $(VBOX_PATH_MESA_GENFILES)/
    27 
    28 if1of ($(KBUILD_TARGET), win)
    29  LIBRARIES += \
     24LIBRARIES.win += \
    3025        VBoxMesaUtilLib \
    3126        VBoxMesaLib \
     
    3530        VBoxMesaSVGALib \
    3631        VBoxMesaSVGAWinsysLib
    37  LIBRARIES.win.amd64 += \
     32LIBRARIES.win.amd64 += \
    3833        VBoxMesaUtilLib-x86 \
    3934        VBoxMesaLib-x86 \
     
    4338        VBoxMesaSVGALib-x86 \
    4439        VBoxMesaSVGAWinsysLib-x86
    45 endif
    46 
    47 
    48 TEMPLATE_VBOXMESA3DGUESTR3LIB             = VBox Mesa 3D Guest User Mode Library
    49 TEMPLATE_VBOXMESA3DGUESTR3LIB_EXTENDS     = VBOXMESA3DGUESTR3DLL
    50 TEMPLATE_VBOXMESA3DGUESTR3LIB_INST        = $(INST_ADDITIONS_LIB)
     40
     41
     42TEMPLATE_VBoxMesa3DGuestR3Lib               = VBox Mesa 3D Guest User Mode Library
     43TEMPLATE_VBoxMesa3DGuestR3Lib_EXTENDS       = VBoxMesa3DGuestR3Dll
     44TEMPLATE_VBoxMesa3DGuestR3Lib_INST          = $(INST_ADDITIONS_LIB)
    5145ifeq ($(KBUILD_TARGET),win)
    5246# Do not treat warnings as errors, because Mesa code produces too many warnings with MSC.
    53  TEMPLATE_VBOXMESA3DGUESTR3LIB_CFLAGS = $(filter-out -WX,$(TEMPLATE_VBOXMESA3DGUESTR3DLL_CFLAGS))
    54  TEMPLATE_VBOXMESA3DGUESTR3LIB_CXXFLAGS = $(filter-out -WX,$(TEMPLATE_VBOXMESA3DGUESTR3DLL_CXXFLAGS))
     47TEMPLATE_VBoxMesa3DGuestR3Lib_CFLAGS        = $(filter-out -WX,$(TEMPLATE_VBoxMesa3DGuestR3Dll_CFLAGS))
     48TEMPLATE_VBoxMesa3DGuestR3Lib_CXXFLAGS      = $(filter-out -WX,$(TEMPLATE_VBoxMesa3DGuestR3Dll_CXXFLAGS))
    5549#  -wd4005: vcc120: '__useHeader' : macro redefinition
    5650#  -wd4013: undefined; assuming extern returning int
     
    9993#  -wd4805: '|=' : unsafe mix of type 'GLboolean' and type 'bool' in operation
    10094#  -wd4918: 'y' : invalid character in pragma optimization list
    101  VBOXMESA3DGUESTR3LIB_DISABLED_WARNINGS = \
    102         -wd4005 -wd4013 -wd4018 -wd4054 -wd4057 -wd4090 -wd4098 -wd4099 -wd4100 -wd4101 -wd4130 -wd4132 -wd4146 -wd4152 -wd4189 \
    103         -wd4200 -wd4204 -wd4206 -wd4211 -wd4221 -wd4245 -wd4255 -wd4258 -wd4265 -wd4267 -wd4266 -wd4287 -wd4291 -wd4305 -wd4306 -wd4310 -wd4311 -wd4351 -wd4355 -wd4388 \
    104         -wd4389 -wd4640 -wd4668 -wd4700 -wd4701 -wd4702 -wd4703 -wd4756 -wd4800 -wd4805 -wd4918
    105  TEMPLATE_VBOXMESA3DGUESTR3LIB_CFLAGS.win += $(VBOXMESA3DGUESTR3LIB_DISABLED_WARNINGS)
    106  TEMPLATE_VBOXMESA3DGUESTR3LIB_CXXFLAGS.win += $(VBOXMESA3DGUESTR3LIB_DISABLED_WARNINGS)
     95VBOX_MESA3D_VCC_DISABLED_WARNINGS           = \
     96        -wd4005 -wd4013 -wd4018 -wd4054 -wd4057 -wd4090 -wd4098 -wd4099 -wd4100 -wd4101 -wd4130 -wd4132 -wd4146 \
     97        -wd4152 -wd4189 -wd4200 -wd4204 -wd4206 -wd4211 -wd4221 -wd4245 -wd4255 -wd4258 -wd4265 -wd4267 -wd4266 \
     98        -wd4287 -wd4291 -wd4305 -wd4306 -wd4310 -wd4311 -wd4351 -wd4355 -wd4388 -wd4389 -wd4640 -wd4668 -wd4700 \
     99        -wd4701 -wd4702 -wd4703 -wd4756 -wd4800 -wd4805 -wd4918
     100TEMPLATE_VBoxMesa3DGuestR3Lib_CFLAGS.win   += $(VBOX_MESA3D_VCC_DISABLED_WARNINGS)
     101TEMPLATE_VBoxMesa3DGuestR3Lib_CXXFLAGS.win += $(VBOX_MESA3D_VCC_DISABLED_WARNINGS)
    107102endif
    108 TEMPLATE_VBOXMESA3DGUESTR3LIB_INCS       = include \
     103TEMPLATE_VBoxMesa3DGuestR3Lib_INCS          = \
     104        include \
    109105        $(VBOX_MESA)/include/GL \
    110106        $(VBOX_MESA)/src/mapi \
     
    114110        $(VBOX_MESA)/src/compiler/nir \
    115111        $(VBOX_MESA)/src/gallium/state_trackers/wgl \
    116         $(TEMPLATE_VBOXMESA3DGUESTR3DLL_INCS)
    117 TEMPLATE_VBOXMESA3DGUESTR3LIB_DEFS       = $(TEMPLATE_VBOXMESA3DGUESTR3DLL_DEFS) \
     112        $(TEMPLATE_VBoxMesa3DGuestR3Dll_INCS)
     113TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS          = \
     114        $(TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS) \
    118115        PACKAGE_VERSION=\"$(VBOX_MESA)\" \
    119116        PACKAGE_BUGREPORT=\"$(VBOX_MESA)\"
    120117# For wgl, glapi and mesa
    121 TEMPLATE_VBOXMESA3DGUESTR3LIB_DEFS      += \
     118TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS         += \
    122119        MAPI_MODE_UTIL _GDI32_ BUILD_GL32 KHRONOS_DLL_EXPORTS GL_API=GLAPI GL_APIENTRY=GLAPIENTRY _GLAPI_NO_EXPORTS
    123 TEMPLATE_VBOXMESA3DGUESTR3LIB_DEFS.release = $(TEMPLATE_VBOXMESA3DGUESTR3DLL_DEFS.release) \
     120TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS.release  = \
     121        $(TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS.release) \
    124122        NDEBUG
    125123
     
    128126# VBoxMesaUtilLib
    129127#
    130 VBoxMesaUtilLib_TEMPLATE       = VBOXMESA3DGUESTR3LIB
    131 VBoxMesaUtilLib_SOURCES        = \
     128VBoxMesaUtilLib_TEMPLATE = VBoxMesa3DGuestR3Lib
     129VBoxMesaUtilLib_SOURCES  = \
    132130        $(VBOX_MESA)/src/util/bitscan.c \
    133131        $(VBOX_MESA)/src/util/build_id.c \
     
    150148        $(VBOX_MESA)/src/util/u_queue.c \
    151149        $(VBOX_MESA)/src/util/u_vector.c
    152 
    153150# Auto-generated
    154 VBoxMesaUtilLib_SOURCES       += \
     151VBoxMesaUtilLib_SOURCES += \
    155152        $(VBOX_MESA)/src/util/format_srgb.c
    156153
    157154# 32 bit lib for 64 bit build
    158 VBoxMesaUtilLib-x86_EXTENDS = VBoxMesaUtilLib
     155VBoxMesaUtilLib-x86_EXTENDS      = VBoxMesaUtilLib
    159156VBoxMesaUtilLib-x86_BLD_TRG_ARCH = x86
    160157
     
    163160# VBoxMesaLib
    164161#
    165 VBoxMesaLib_TEMPLATE       = VBOXMESA3DGUESTR3LIB
    166 VBoxMesaLib_SOURCES    += \
     162VBoxMesaLib_TEMPLATE = VBoxMesa3DGuestR3Lib
     163VBoxMesaLib_SOURCES  = \
    167164        $(VBOX_MESA)/src/mesa/state_tracker/st_atifs_to_tgsi.c \
    168165        $(VBOX_MESA)/src/mesa/state_tracker/st_atom_array.c \
     
    239236        $(VBOX_MESA)/src/mesa/state_tracker/st_tgsi_lower_yuv.c \
    240237        $(VBOX_MESA)/src/mesa/state_tracker/st_vdpau.c
    241 VBoxMesaLib_SOURCES    += \
     238VBoxMesaLib_SOURCES += \
    242239        $(VBOX_MESA)/src/mesa/program/arbprogparse.c \
    243240        $(VBOX_MESA)/src/mesa/program/ir_to_mesa.cpp \
     
    258255        $(VBOX_MESA)/src/mesa/program/prog_statevars.c \
    259256        $(VBOX_MESA)/src/mesa/program/symbol_table.c
    260 VBoxMesaLib_SOURCES    += \
     257VBoxMesaLib_SOURCES += \
    261258        $(VBOX_MESA)/src/mesa/main/accum.c \
    262259        $(VBOX_MESA)/src/mesa/main/api_arrayelt.c \
     
    385382        $(VBOX_MESA)/src/mesa/main/vtxfmt.c \
    386383        $(VBOX_MESA)/src/mesa/main/es1_conversion.c
    387 VBoxMesaLib_SOURCES    += \
     384VBoxMesaLib_SOURCES += \
    388385        $(VBOX_MESA)/src/mesa/math/m_debug_clip.c \
    389386        $(VBOX_MESA)/src/mesa/math/m_debug_norm.c \
     
    393390        $(VBOX_MESA)/src/mesa/math/m_translate.c \
    394391        $(VBOX_MESA)/src/mesa/math/m_vector.c
    395 VBoxMesaLib_SOURCES    += \
     392VBoxMesaLib_SOURCES += \
    396393        $(VBOX_MESA)/src/mesa/vbo/vbo_context.c \
    397394        $(VBOX_MESA)/src/mesa/vbo/vbo_exec_api.c \
     
    411408        $(VBOX_MESA)/src/mesa/vbo/vbo_split_copy.c \
    412409        $(VBOX_MESA)/src/mesa/vbo/vbo_split_inplace.c
    413 VBoxMesaLib_SOURCES    += \
     410VBoxMesaLib_SOURCES += \
    414411        $(VBOX_MESA)/src/compiler/blob.c \
    415412        $(VBOX_MESA)/src/compiler/glsl_types.cpp \
     
    612609        $(VBOX_MESA)/src/compiler/nir/nir_validate.c \
    613610        $(VBOX_MESA)/src/compiler/nir/nir_worklist.c
    614 VBoxMesaLib_SOURCES    += \
     611VBoxMesaLib_SOURCES += \
    615612        $(VBOX_MESA)/src/mapi/glapi/glapi_dispatch.c \
    616613        $(VBOX_MESA)/src/mapi/glapi/glapi_entrypoint.c \
     
    620617        $(VBOX_MESA)/src/mapi/u_current.c \
    621618        $(VBOX_MESA)/src/mapi/u_execmem.c
     619# Not used
     620#       $(VBOX_MESA)/src/compiler/glsl/standalone_scaffolding.cpp
     621#       $(VBOX_MESA)/src/compiler/glsl/standalone.cpp
    622622
    623623# Disable optimization for some files, because it takes over 2 minutes to compile them with MSC otherwise.
     
    626626$(VBOX_MESA)/src/mesa/main/mipmap.c_CFLAGS.release        += -Od
    627627
    628 # Not used
    629 #       $(VBOX_MESA)/src/compiler/glsl/standalone_scaffolding.cpp
    630 #       $(VBOX_MESA)/src/compiler/glsl/standalone.cpp
    631 
    632628# 32 bit lib for 64 bit build
    633 VBoxMesaLib-x86_EXTENDS = VBoxMesaLib
     629VBoxMesaLib-x86_EXTENDS      = VBoxMesaLib
    634630VBoxMesaLib-x86_BLD_TRG_ARCH = x86
    635631
     
    638634# VBoxMesaWglLib
    639635#
    640 VBoxMesaWglLib_TEMPLATE       = VBOXMESA3DGUESTR3LIB
    641 VBoxMesaWglLib_SOURCES        = \
     636VBoxMesaWglLib_TEMPLATE = VBoxMesa3DGuestR3Lib
     637VBoxMesaWglLib_SOURCES  = \
    642638        $(VBOX_MESA)/src/gallium/state_trackers/wgl/stw_context.c \
    643639        $(VBOX_MESA)/src/gallium/state_trackers/wgl/stw_device.c \
     
    657653
    658654# 32 bit lib for 64 bit build
    659 VBoxMesaWglLib-x86_EXTENDS = VBoxMesaWglLib
     655VBoxMesaWglLib-x86_EXTENDS      = VBoxMesaWglLib
    660656VBoxMesaWglLib-x86_BLD_TRG_ARCH = x86
    661657
     
    664660# VBoxMesaGalliumAuxLib
    665661#
    666 VBoxMesaGalliumAuxLib_TEMPLATE     = VBOXMESA3DGUESTR3LIB
    667 VBoxMesaGalliumAuxLib_SOURCES      = \
     662VBoxMesaGalliumAuxLib_TEMPLATE = VBoxMesa3DGuestR3Lib
     663VBoxMesaGalliumAuxLib_SOURCES  = \
    668664        $(VBOX_MESA)/src/gallium/auxiliary/cso_cache/cso_cache.c \
    669665        $(VBOX_MESA)/src/gallium/auxiliary/cso_cache/cso_context.c \
     
    818814        $(VBOX_MESA)/src/gallium/auxiliary/util/u_upload_mgr.c \
    819815        $(VBOX_MESA)/src/gallium/auxiliary/util/u_vbuf.c
    820 
    821816# Auto-generated
    822 VBoxMesaGalliumAuxLib_SOURCES     += \
     817VBoxMesaGalliumAuxLib_SOURCES += \
    823818        $(VBOX_MESA)/src/gallium/auxiliary/indices/u_indices_gen.c \
    824819        $(VBOX_MESA)/src/gallium/auxiliary/indices/u_unfilled_gen.c \
     
    826821
    827822# 32 bit lib for 64 bit build
    828 VBoxMesaGalliumAuxLib-x86_EXTENDS = VBoxMesaGalliumAuxLib
     823VBoxMesaGalliumAuxLib-x86_EXTENDS      = VBoxMesaGalliumAuxLib
    829824VBoxMesaGalliumAuxLib-x86_BLD_TRG_ARCH = x86
    830825
     
    833828# VBoxMesaNineLib
    834829#
    835 VBoxMesaNineLib_TEMPLATE           = VBOXMESA3DGUESTR3LIB
    836 VBoxMesaNineLib_INCS              += $(VBOX_MESA)/include/D3D9
    837 VBoxMesaNineLib_DEFS.win          += COBJMACROS INC_OLE2
     830VBoxMesaNineLib_TEMPLATE   = VBoxMesa3DGuestR3Lib
     831VBoxMesaNineLib_INCS       = \
     832        $(VBOX_MESA)/include/D3D9
     833VBoxMesaNineLib_DEFS.win   = COBJMACROS INC_OLE2
    838834# -wd4028: formal parameter 4 different from declaration
    839835#    'nine_context_set_vertex_shader_constant_f' parameter is declared 'const unsigned pConstantData_size'
    840836#    but autogenerated code produces 'unsigned pConstantData_size'.
    841 VBoxMesaNineLib_CFLAGS.win += -wd4028
    842 VBoxMesaNineLib_SOURCES            = \
     837VBoxMesaNineLib_CFLAGS.win = -wd4028
     838VBoxMesaNineLib_SOURCES    = \
    843839        $(VBOX_MESA)/src/gallium/state_trackers/nine/adapter9.c \
    844840        $(VBOX_MESA)/src/gallium/state_trackers/nine/authenticatedchannel9.c \
     
    880876        $(VBOX_MESA)/src/gallium/state_trackers/nine/volumetexture9.c
    881877
    882 #VBOX_MESA_PYTHON_ENV = $(REDIRECT) $(if $1,-E 'PYTHONPATH=$1',) $(if $2,-o $2,) -0 $(if $3,$3,/dev/null) --
    883 #
    884 ## for u_format.h
    885 #VBoxMesaNineLib_INCS          += ./$(VBOX_MESA)/src/gallium/auxiliary/util
    886 #
    887 #VBoxMesaNineLib_SOURCES       += \
    888 #       $(VBOX_PATH_MESA_GENFILES)/u_indices_gen.c \
    889 #       $(VBOX_PATH_MESA_GENFILES)/u_format_table.c \
    890 #       $(VBOX_PATH_MESA_GENFILES)/u_unfilled_gen.c
    891 #
    892 #$(VBOX_PATH_MESA_GENFILES)/u_indices_gen.c: \
    893 #               $(addprefix $(PATH_SUB_CURRENT)/$(VBOX_MESA)/src/gallium/auxiliary/indices/, u_indices_gen.py) \
    894 #               | $$(dir $$@)
    895 #       $(call MSG_GENERATE,python,$@,$<)
    896 #       $(QUIET)$(call VBOX_MESA_PYTHON_ENV,$(VBOX_PATH_MESA_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
    897 #
    898 #$(VBOX_PATH_MESA_GENFILES)/u_unfilled_gen.c: \
    899 #               $(addprefix $(PATH_SUB_CURRENT)/$(VBOX_MESA)/src/gallium/auxiliary/indices/, u_unfilled_gen.py) \
    900 #               | $$(dir $$@)
    901 #       $(call MSG_GENERATE,python,$@,$<)
    902 #       $(QUIET)$(call VBOX_MESA_PYTHON_ENV,$(VBOX_PATH_MESA_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
    903 #
    904 #$(VBOX_PATH_MESA_GENFILES)/u_format_table.c: \
    905 #               $(addprefix $(PATH_SUB_CURRENT)/$(VBOX_MESA)/src/gallium/auxiliary/util/, u_format_table.py u_format.csv) \
    906 #               | $$(dir $$@)
    907 #       $(call MSG_GENERATE,python,$@,$<)
    908 #       $(QUIET)$(call VBOX_MESA_PYTHON_ENV,$(VBOX_PATH_MESA_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(PATH_SUB_CURRENT)/$(VBOX_MESA)/src/gallium/auxiliary/util/u_format.csv
    909 
    910878# 32 bit lib for 64 bit build
    911 VBoxMesaNineLib-x86_EXTENDS = VBoxMesaNineLib
     879VBoxMesaNineLib-x86_EXTENDS      = VBoxMesaNineLib
    912880VBoxMesaNineLib-x86_BLD_TRG_ARCH = x86
    913881
     
    916884# VBoxMesaSVGALib
    917885#
    918 VBoxMesaSVGALib_TEMPLATE           = VBOXMESA3DGUESTR3LIB
    919 VBoxMesaSVGALib_INCS              += $(VBOX_MESA)/src/gallium/drivers/svga/include
    920 VBoxMesaSVGALib_SOURCES            = \
     886VBoxMesaSVGALib_TEMPLATE = VBoxMesa3DGuestR3Lib
     887VBoxMesaSVGALib_INCS     = \
     888        $(VBOX_MESA)/src/gallium/drivers/svga/include
     889VBoxMesaSVGALib_SOURCES  = \
    921890        $(VBOX_MESA)/src/gallium/drivers/svga/svga_cmd.c \
    922891        $(VBOX_MESA)/src/gallium/drivers/svga/svga_cmd_vgpu10.c \
     
    977946
    978947# 32 bit lib for 64 bit build
    979 VBoxMesaSVGALib-x86_EXTENDS = VBoxMesaSVGALib
     948VBoxMesaSVGALib-x86_EXTENDS      = VBoxMesaSVGALib
    980949VBoxMesaSVGALib-x86_BLD_TRG_ARCH = x86
    981950
     
    984953# VBoxMesaSVGAWinsysLib
    985954#
    986 VBoxMesaSVGAWinsysLib_TEMPLATE           = VBOXMESA3DGUESTR3LIB
    987 VBoxMesaSVGAWinsysLib_INCS              += \
     955VBoxMesaSVGAWinsysLib_TEMPLATE = VBoxMesa3DGuestR3Lib
     956VBoxMesaSVGAWinsysLib_INCS    += \
    988957        $(VBOX_MESA)/src/gallium/drivers/svga/include \
    989958        $(VBOX_MESA)/src/gallium/drivers/svga
    990 VBoxMesaSVGAWinsysLib_SOURCES            = \
     959VBoxMesaSVGAWinsysLib_SOURCES  = \
    991960        $(VBOX_MESA)/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c \
    992961        $(VBOX_MESA)/src/gallium/winsys/svga/drm/vmw_buffer.c \
     
    1000969
    1001970# These will be reimplemented for WDDM
    1002 #VBoxMesaSVGAWinsysLib_SOURCES            += \
     971#VBoxMesaSVGAWinsysLib_SOURCES += \
    1003972#       $(VBOX_MESA)/src/gallium/winsys/svga/drm/vmw_screen.c \
    1004973#       $(VBOX_MESA)/src/gallium/winsys/svga/drm/vmw_screen_dri.c \
     
    1006975
    1007976# 32 bit lib for 64 bit build
    1008 VBoxMesaSVGAWinsysLib-x86_EXTENDS = VBoxMesaSVGAWinsysLib
     977VBoxMesaSVGAWinsysLib-x86_EXTENDS      = VBoxMesaSVGAWinsysLib
    1009978VBoxMesaSVGAWinsysLib-x86_BLD_TRG_ARCH = x86
    1010979
    1011980
    1012981include $(FILE_KBUILD_SUB_FOOTER)
     982
  • trunk/src/VBox/Additions/3D/win/Makefile.kmk

    r75562 r75635  
    55
    66#
    7 # Copyright (C) 2016-2017 Oracle Corporation
     7# Copyright (C) 2016-2018 Oracle Corporation
    88#
    99# This file is part of VirtualBox Open Source Edition (OSE), as
     
    2727
    2828include $(FILE_KBUILD_SUB_FOOTER)
     29
  • trunk/src/VBox/Additions/3D/win/VBoxGL/Makefile.kmk

    r75443 r75635  
    2222#VBOX_WITH_MESA3D_GL_SOFTWARE = 1
    2323
    24 DLLS += VBoxGL
    25 VBoxGL_TEMPLATE    = VBOXMESA3DGUESTR3DLLMinVista
    26 #  -wd4005: '__useHeader' : redefinition
    27 VBoxGL_CFLAGS      = -wd4005
     24DLLS       += VBoxGL
     25DLLS.amd64 += VBoxGL-x86
    2826
    29 VBoxGL_INCS       += \
     27VBoxGL_TEMPLATE = VBoxMesa3DGuestR3DllMinVista
     28# -wd4005: '__useHeader' : redefinition
     29VBoxGL_CFLAGS   = -wd4005
     30VBoxGL_INCS     = \
    3031        $(VBOX_PATH_3D)/win/include \
    3132        $(VBOX_PATH_MESA)/include/GL \
     
    3738        $(VBOX_PATH_VMSVGA_INC) \
    3839        $(VBOX_GRAPHICS_INCS)
    39 
    40 VBoxGL_SOURCES     = \
     40VBoxGL_SOURCES  = \
    4141        $(VBOX_PATH_MESA)/src/gallium/state_trackers/wgl/opengl32.def \
    4242        VBoxGL.rc
    43 
    4443ifndef VBOX_WITH_MESA3D_GL_SOFTWARE
    45 VBoxGL_SOURCES     += \
     44VBoxGL_SOURCES += \
    4645        GaDrvEnvKMT.cpp \
    4746        VBoxGL.c
    4847else
    49 VBoxGL_SOURCES    += \
     48VBoxGL_SOURCES += \
    5049        $(VBOX_PATH_MESA)/src/gallium/targets/libgl-gdi/libgl_gdi.c
    51 VBoxGL_SOURCES    += \
     50VBoxGL_SOURCES += \
    5251        $(VBOX_PATH_MESA)/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c
    53 VBoxGL_SOURCES    += \
     52VBoxGL_SOURCES += \
    5453        $(VBOX_PATH_MESA)/src/gallium/drivers/softpipe/sp_buffer.c \
    5554        $(VBOX_PATH_MESA)/src/gallium/drivers/softpipe/sp_clear.c \
     
    8685        $(VBOX_PATH_MESA)/src/gallium/drivers/softpipe/sp_tile_cache.c
    8786endif
    88 
    89 VBoxGL_LIBS        = \
     87VBoxGL_LIBS     = \
    9088        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB) \
    9189        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib$(VBOX_SUFF_LIB) \
     
    102100# VBoxGL-x86 - x86 version of VBoxGL built for amd64 build
    103101#
    104 DLLS.win.amd64 += VBoxGL-x86
    105 VBoxGL-x86_EXTENDS = VBoxGL
     102VBoxGL-x86_EXTENDS      = VBoxGL
    106103VBoxGL-x86_BLD_TRG_ARCH = x86
    107 VBoxGL-x86_LIBS        = \
     104VBoxGL-x86_LIBS         = \
    108105        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB) \
    109106        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib-x86$(VBOX_SUFF_LIB) \
     
    111108        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaUtilLib-x86$(VBOX_SUFF_LIB) \
    112109        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaLib-x86$(VBOX_SUFF_LIB)
    113 VBoxGL-x86_DEFS = $(VBoxGL_DEFS) VBOX_WOW64
     110VBoxGL-x86_DEFS         = $(VBoxGL_DEFS) VBOX_WOW64
    114111
    115112include $(FILE_KBUILD_SUB_FOOTER)
     113
  • trunk/src/VBox/Additions/3D/win/VBoxICD/Makefile.kmk

    r75621 r75635  
    1919include $(KBUILD_PATH)/subheader.kmk
    2020
    21 VBOX_PATH_GL_GEN = $(PATH_OBJ)/VBoxGLgen
    2221VBOX_GL_ICD_DEF_FILE = $(VBOX_PATH_MESA)/src/gallium/state_trackers/wgl/opengl32.mingw.def
    2322
    24 BLDDIRS += $(VBOX_PATH_GL_GEN)/
     23DLLS       += VBoxICD
     24DLLS.amd64 += VBoxICD-x86
    2525
    26 DLLS += VBoxICD
    27 VBoxICD_TEMPLATE    = VBOXMESA3DGUESTR3DLLMinVista
    28 #  -wd4005: '__useHeader' : redefinition
    29 VBoxICD_CFLAGS      = -wd4005
    30 
    31 VBoxICD_INCS       += \
     26VBoxICD_TEMPLATE = VBoxMesa3DGuestR3DllMinVista
     27# -wd4005: '__useHeader' : redefinition
     28VBoxICD_CFLAGS   = -wd4005
     29VBoxICD_INCS     = \
    3230        $(VBOX_PATH_3D)/win/include \
    3331        $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video \
    3432        $(VBOX_GRAPHICS_INCS)
    35 
    36 VBoxICD_SOURCES     = \
     33VBoxICD_SOURCES  = \
    3734        $(VBOX_PATH_MESA)/src/gallium/state_trackers/wgl/opengl32.def \
    38         $(VBOX_PATH_GL_GEN)/forwarders.asm \
    39         $(VBOX_PATH_GL_GEN)/pfns.c \
     35        $(VBoxICD_0_OUTDIR)/forwarders.asm \
     36        $(VBoxICD_0_OUTDIR)/pfns.c \
    4037        VBoxICD.c \
    4138        VBoxICD.rc
    42 
    43 VBoxICD_LIBS        = \
     39VBoxICD_CLEAN    = \
     40        $(VBoxICD_0_OUTDIR)/forwarders.asm \
     41        $(VBoxICD_0_OUTDIR)/pfns.c
     42VBoxICD_LIBS     = \
    4443        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB)
    4544
    46 $(VBOX_PATH_GL_GEN)/forwarders.asm: \
    47                 $(PATH_SUB_CURRENT)/icd_forwarders.py \
    48                 $(VBOX_GL_ICD_DEF_FILE) \
    49                 Makefile.kmk \
    50                 | $$(dir $$@)
     45$$(VBoxICD_0_OUTDIR)/forwarders.asm: \
     46                $(PATH_SUB_CURRENT)/icd_forwarders.py $(VBOX_GL_ICD_DEF_FILE) | $$(dir $$@)
    5147        $(call MSG_GENERATE,python,$@,$(VBOX_GL_ICD_DEF_FILE))
    5248        $(QUIET)$(VBOX_BLD_PYTHON) $< $(VBOX_GL_ICD_DEF_FILE) $@
    53 $(VBOX_PATH_GL_GEN)/pfns.c: \
    54                 $(PATH_SUB_CURRENT)/icd_pfns.py \
    55                 $(VBOX_GL_ICD_DEF_FILE) \
    56                 Makefile.kmk \
    57                 | $$(dir $$@)
     49$$(VBoxICD_0_OUTDIR)/pfns.c: \
     50                $(PATH_SUB_CURRENT)/icd_pfns.py $(VBOX_GL_ICD_DEF_FILE) | $$(dir $$@)
    5851        $(call MSG_GENERATE,python,$@,$(VBOX_GL_ICD_DEF_FILE))
    5952        $(QUIET)$(VBOX_BLD_PYTHON) $< $(VBOX_GL_ICD_DEF_FILE) $@
    60 
    61 VBoxICD_CLEAN      = \
    62         $(VBOX_PATH_GL_GEN)/forwarders.asm \
    63         $(VBOX_PATH_GL_GEN)/pfns.c
    6453
    6554ifdef VBOX_SIGN_ADDITIONS
     
    7160# x86 version built for amd64 build
    7261#
    73 DLLS.win.amd64 += VBoxICD-x86
    74 VBoxICD-x86_EXTENDS = VBoxICD
     62VBoxICD-x86_EXTENDS      = VBoxICD
    7563VBoxICD-x86_BLD_TRG_ARCH = x86
    76 VBoxICD-x86_LIBS        = \
     64VBoxICD-x86_LIBS         = \
    7765        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB)
    78 VBoxICD-x86_DEFS = $(VBoxICD_DEFS) VBOX_WOW64
     66VBoxICD-x86_DEFS         = $(VBoxICD_DEFS) VBOX_WOW64
    7967
    8068include $(FILE_KBUILD_SUB_FOOTER)
     69
  • trunk/src/VBox/Additions/3D/win/VBoxNine/Makefile.kmk

    r75443 r75635  
    1919include $(KBUILD_PATH)/subheader.kmk
    2020
    21 DLLS += VBoxNine
    22 VBoxNine_TEMPLATE    = VBOXMESA3DGUESTR3DLLMinVista
     21DLLS       += VBoxNine
     22DLLS.amd64 += VBoxNine-x86
     23
     24VBoxNine_TEMPLATE = VBoxMesa3DGuestR3DllMinVista
    2325#  -wd4100: unreferenced formal parameter
    2426#  -wd4200: nonstandard extension used : zero-sized array in struct/union
     
    2628#  -wd4255: no function prototype given
    2729#  -wd4668: 'something' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
    28 VBoxNine_CFLAGS     += -wd4100 -wd4200 -wd4245 -wd4255 -wd4668
    29 VBoxNine_INCS       += \
     30VBoxNine_CFLAGS   = -wd4100 -wd4200 -wd4245 -wd4255 -wd4668
     31VBoxNine_INCS     = \
    3032        $(VBOX_PATH_MESA)/src/gallium/state_trackers/nine
    31 
    32 VBoxNine_SOURCES     = \
     33VBoxNine_SOURCES  = \
    3334        VBoxNine.c \
    3435        VBoxNine.rc \
    3536        VBoxNine.def
    36 
    37 VBoxNine_LIBS        = \
     37VBoxNine_LIBS     = \
    3838        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB) \
    3939        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib$(VBOX_SUFF_LIB) \
     
    4949# VBoxNine-x86 - x86 version of VBoxNine built for amd64 build
    5050#
    51 DLLS.win.amd64 += VBoxNine-x86
    52 VBoxNine-x86_EXTENDS = VBoxNine
     51VBoxNine-x86_EXTENDS      = VBoxNine
    5352VBoxNine-x86_BLD_TRG_ARCH = x86
    54 VBoxNine-x86_LIBS        = \
     53VBoxNine-x86_LIBS         = \
    5554        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB) \
    5655        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib-x86$(VBOX_SUFF_LIB) \
    5756        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaUtilLib-x86$(VBOX_SUFF_LIB) \
    5857        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaNineLib-x86$(VBOX_SUFF_LIB)
    59 VBoxNine-x86_DEFS = $(VBoxNine_DEFS) VBOX_WOW64
     58VBoxNine-x86_DEFS         = $(VBoxNine_DEFS) VBOX_WOW64
    6059
    6160include $(FILE_KBUILD_SUB_FOOTER)
     61
  • trunk/src/VBox/Additions/3D/win/VBoxSVGA/Makefile.kmk

    r75443 r75635  
    1919include $(KBUILD_PATH)/subheader.kmk
    2020
    21 DLLS += VBoxSVGA
    22 VBoxSVGA_TEMPLATE    = VBOXMESA3DGUESTR3DLLMinVista
     21DLLS       += VBoxSVGA
     22DLLS.amd64 += VBoxSVGA-x86
     23
     24VBoxSVGA_TEMPLATE = VBoxMesa3DGuestR3DllMinVista
    2325#  -wd4005: vcc120: '__useHeader' : macro redefinition
    2426#  -wd4100: unreferenced formal parameter
     
    2830#  -wd4255: no function prototype given
    2931#  -wd4668: 'something' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
    30 VBoxSVGA_CFLAGS     += -wd4005 -wd4100 -wd4200 -wd4211 -wd4245 -wd4255 -wd4668
    31 
    32 VBoxSVGA_INCS       += \
     32VBoxSVGA_CFLAGS   = -wd4005 -wd4100 -wd4200 -wd4211 -wd4245 -wd4255 -wd4668
     33VBoxSVGA_INCS     = \
    3334        $(VBOX_PATH_3D)/win/include \
    3435        $(VBOX_PATH_MESA)/src/gallium/drivers/svga \
    3536        $(VBOX_PATH_MESA)/src/gallium/drivers/svga/include \
    3637        $(VBOX_PATH_MESA)/src/gallium/winsys/svga/drm
    37 
    38 VBoxSVGA_SOURCES     = \
     38VBoxSVGA_SOURCES  = \
    3939        winsys/vmw_screen_ioctl.c \
    4040        winsys/vmw_screen_wddm.c \
     
    4343        VBoxSVGA.rc \
    4444        VBoxSVGA.def
    45 
    46 VBoxSVGA_LIBS        = \
     45VBoxSVGA_LIBS     = \
    4746        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB) \
    4847        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib$(VBOX_SUFF_LIB) \
     
    5958# VBoxSVGA-x86 - x86 version of VBoxSVGA built for amd64 build
    6059#
    61 DLLS.win.amd64 += VBoxSVGA-x86
    62 VBoxSVGA-x86_EXTENDS = VBoxSVGA
     60VBoxSVGA-x86_EXTENDS      = VBoxSVGA
    6361VBoxSVGA-x86_BLD_TRG_ARCH = x86
    64 VBoxSVGA-x86_LIBS        = \
     62VBoxSVGA-x86_LIBS         = \
    6563        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB) \
    6664        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib-x86$(VBOX_SUFF_LIB) \
     
    6866        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaSVGAWinsysLib-x86$(VBOX_SUFF_LIB) \
    6967        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaSVGALib-x86$(VBOX_SUFF_LIB)
    70 VBoxSVGA-x86_DEFS = $(VBoxSVGA_DEFS) VBOX_WOW64
     68VBoxSVGA-x86_DEFS         = $(VBoxSVGA_DEFS) VBOX_WOW64
    7169
    7270include $(FILE_KBUILD_SUB_FOOTER)
  • trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/Makefile.kmk

    r75456 r75635  
    1919include $(KBUILD_PATH)/subheader.kmk
    2020
    21 LIBRARIES += VBoxWddmUmHlp
     21LIBRARIES       += VBoxWddmUmHlp
    2222LIBRARIES.amd64 += VBoxWddmUmHlp-x86
    2323
     
    2525# VBoxWddmUmHlp - logger and other helpers for user mode driver
    2626#
    27 VBoxWddmUmHlp_TEMPLATE    = VBOXMESA3DGUESTR3DLLMinVista
    28 VBoxWddmUmHlp_INST        = $(INST_ADDITIONS_LIB)
    29 VBoxWddmUmHlp_DEFS        = VBOX_WITH_WDDM
    30 VBoxWddmUmHlp_INCS        = \
     27VBoxWddmUmHlp_TEMPLATE = VBoxMesa3DGuestR3DllMinVista
     28VBoxWddmUmHlp_INST     = $(INST_ADDITIONS_LIB)
     29VBoxWddmUmHlp_DEFS     = VBOX_WITH_WDDM
     30VBoxWddmUmHlp_INCS     = \
    3131        $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
    3232        $(VBOX_PATH_3D)/win/include \
    3333        $(VBOX_GRAPHICS_INCS)
    34 VBoxWddmUmHlp_SOURCES     = \
     34VBoxWddmUmHlp_SOURCES  = \
    3535        D3DKMT.cpp \
    3636        VBoxMpLogger.cpp
     
    3939# 64-bit version for 32-bit build.
    4040#
    41 VBoxWddmUmHlp-x86_EXTENDS = VBoxWddmUmHlp
     41VBoxWddmUmHlp-x86_EXTENDS      = VBoxWddmUmHlp
    4242VBoxWddmUmHlp-x86_BLD_TRG_ARCH = x86
    4343
    4444include $(FILE_KBUILD_SUB_FOOTER)
     45
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