VirtualBox

Changeset 98209 in vbox for trunk


Ignore:
Timestamp:
Jan 22, 2023 1:36:11 PM (21 months ago)
Author:
vboxsync
Message:

/Config.kmk: s/VBOXGUESTR3DLL/VBoxGuestR3DllNonPedantic/ making the latter include IPRT & VBGL. bugref:10348

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r98205 r98209  
    84548454
    84558455#
    8456 # Template for building R3 (dynamic) libraries for the guest additions.
    8457 #
    8458 TEMPLATE_VBOXGUESTR3DLL           = VBox Guest User Dynamic Libraries
    8459 TEMPLATE_VBOXGUESTR3DLL_EXTENDS   = VBoxGuestR3ExeBase
     8456# Template for building R3 (dynamic) libraries for the guest additions, relaxed.
     8457#
     8458TEMPLATE_VBoxGuestR3DllNonPedantic          := VBox Guest User Dynamic Libraries w/ IPRT and VBGL, non-pedantic.
     8459TEMPLATE_VBoxGuestR3DllNonPedantic_EXTENDS  := VBoxGuestR3ExeBase
    84608460## @todo add a INSTFUN that separates dlls and libs.
    84618461ifeq ($(KBUILD_TARGET),win)
    84628462 ifeq ($(KBUILD_TYPE),asan)
    8463   TEMPLATE_VBOXGUESTR3DLL_LIBS.x86   = $(patsubst %clang_rt.asan-i386.lib, %clang_rt.asan_dll_thunk-i386.lib, $(filter-out %clang_rt.asan_cxx-i386.lib,$(TEMPLATE_VBoxGuestR3ExeBase_LIBS.x86)))
    8464   TEMPLATE_VBOXGUESTR3DLL_LIBS.amd64 = $(patsubst %clang_rt.asan-x86_64.lib, %clang_rt.asan_dll_thunk-x86_64.lib, $(filter-out %clang_rt.asan_cxx-x86_64.lib,$(TEMPLATE_VBoxGuestR3ExeBase_LIBS.amd64)))
     8463  TEMPLATE_VBoxGuestR3DllNonPedantic_LIBS.x86   = $(patsubst %clang_rt.asan-i386.lib, %clang_rt.asan_dll_thunk-i386.lib, $(filter-out %clang_rt.asan_cxx-i386.lib,$(TEMPLATE_VBoxGuestR3ExeBase_LIBS.x86)))
     8464  TEMPLATE_VBoxGuestR3DllNonPedantic_LIBS.amd64 = $(patsubst %clang_rt.asan-x86_64.lib, %clang_rt.asan_dll_thunk-x86_64.lib, $(filter-out %clang_rt.asan_cxx-x86_64.lib,$(TEMPLATE_VBoxGuestR3ExeBase_LIBS.amd64)))
    84658465 endif
    84668466else ifn1of ($(KBUILD_TARGET), darwin os2 win)
    8467  TEMPLATE_VBOXGUESTR3DLL_DEFS     = $(TEMPLATE_VBoxGuestR3ExeBase_DEFS) PIC
    8468  TEMPLATE_VBOXGUESTR3DLL_CFLAGS   = $(TEMPLATE_VBoxGuestR3ExeBase_CFLAGS) -fPIC
    8469  TEMPLATE_VBOXGUESTR3DLL_CXXFLAGS = $(TEMPLATE_VBoxGuestR3ExeBase_CXXFLAGS) -fPIC -fno-exceptions
    8470  TEMPLATE_VBOXGUESTR3DLL_LDFLAGS  = $(TEMPLATE_VBoxGuestR3ExeBase_LDFLAGS) -fPIC
    8471 endif
    8472 
    8473 #
    8474 # Template for building normal R3 (dynamic) libraries for the guest additions, strict.
    8475 #
    8476 TEMPLATE_VBoxGuestR3Dll = VBox Guest User Dynamic Libraries w/ IPRT and VBGL.
    8477 TEMPLATE_VBoxGuestR3Dll_EXTENDS    = VBOXGUESTR3DLL
    8478 ifeq ($(KBUILD_TARGET),win)
    8479  TEMPLATE_VBoxGuestR3Dll_CFLAGS    = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) $(VBOX_VCC_WERR)
    8480  TEMPLATE_VBoxGuestR3Dll_CXXFLAGS  = $(TEMPLATE_VBOXGUESTR3DLL_CXXFLAGS) $(VBOX_VCC_WERR)
    8481  TEMPLATE_VBoxGuestR3Dll_LDFLAGS   = $(TEMPLATE_VBOXGUESTR3DLL_LDFLAGS) $(VBOX_VCC_LD_WERR)
    8482 else
    8483  TEMPLATE_VBoxGuestR3Dll_CFLAGS    = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) $(VBOX_GCC_WERR)
    8484  TEMPLATE_VBoxGuestR3Dll_CXXFLAGS  = $(TEMPLATE_VBOXGUESTR3DLL_CXXFLAGS) $(VBOX_GCC_WERR)
    8485 endif
    8486 TEMPLATE_VBoxGuestR3Dll_LIBS       = \
     8467 TEMPLATE_VBoxGuestR3DllNonPedantic_DEFS     = $(TEMPLATE_VBoxGuestR3ExeBase_DEFS) PIC
     8468 TEMPLATE_VBoxGuestR3DllNonPedantic_CFLAGS   = $(TEMPLATE_VBoxGuestR3ExeBase_CFLAGS) -fPIC
     8469 TEMPLATE_VBoxGuestR3DllNonPedantic_CXXFLAGS = $(TEMPLATE_VBoxGuestR3ExeBase_CXXFLAGS) -fPIC -fno-exceptions
     8470 TEMPLATE_VBoxGuestR3DllNonPedantic_LDFLAGS  = $(TEMPLATE_VBoxGuestR3ExeBase_LDFLAGS) -fPIC
     8471endif
     8472TEMPLATE_VBoxGuestR3DllNonPedantic_LIBS      = \
    84878473        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
    84888474        $(VBOX_LIB_VBGL_R3_SHARED) \
    84898475        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
    8490         $(TEMPLATE_VBOXGUESTR3DLL_LIBS)
    8491 
     8476        $(TEMPLATE_VBoxGuestR3ExeBase_LIBS)
     8477
     8478#
     8479# Template for building normal R3 (dynamic) libraries for the guest additions, strict.
     8480#
     8481TEMPLATE_VBoxGuestR3Dll           := VBox Guest User Dynamic Libraries w/ IPRT and VBGL.
     8482TEMPLATE_VBoxGuestR3Dll_EXTENDS   := VBoxGuestR3DllNonPedantic
     8483ifeq ($(KBUILD_TARGET),win)
     8484 TEMPLATE_VBoxGuestR3Dll_CFLAGS    = $(TEMPLATE_VBoxGuestR3DllNonPedantic_CFLAGS) $(VBOX_VCC_WERR)
     8485 TEMPLATE_VBoxGuestR3Dll_CXXFLAGS  = $(TEMPLATE_VBoxGuestR3DllNonPedantic_CXXFLAGS) $(VBOX_VCC_WERR)
     8486 TEMPLATE_VBoxGuestR3Dll_LDFLAGS   = $(TEMPLATE_VBoxGuestR3DllNonPedantic_LDFLAGS) $(VBOX_VCC_LD_WERR)
     8487else
     8488 TEMPLATE_VBoxGuestR3Dll_CFLAGS    = $(TEMPLATE_VBoxGuestR3DllNonPedantic_CFLAGS) $(VBOX_GCC_WERR)
     8489 TEMPLATE_VBoxGuestR3Dll_CXXFLAGS  = $(TEMPLATE_VBoxGuestR3DllNonPedantic_CXXFLAGS) $(VBOX_GCC_WERR)
     8490endif
    84928491
    84938492#
     
    85268525# Template for building normal R3 (dynamic) libraries for the guest additions with Visual C++ 2013 or later, strict.
    85278526#
    8528 TEMPLATE_NewerVccVBoxGuestR3Dll          = VBOXGUESTR3DLL with the newer Visual C++ version (2013 or later).
    8529 TEMPLATE_NewerVccVBoxGuestR3Dll_EXTENDS  = VBOXGUESTR3DLL
     8527TEMPLATE_NewerVccVBoxGuestR3Dll          = VBoxGuestR3DllNonPedantic with the newer Visual C++ version (2013 or later).
     8528TEMPLATE_NewerVccVBoxGuestR3Dll_EXTENDS  = VBoxGuestR3DllNonPedantic
    85308529if "$(KBUILD_TARGET)" == "win" && "$(VBOX_NEWER_VCC_TOOL_STEM)" != "$(VBOX_VCC_TOOL_STEM)"
    85318530 TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.x86    = $(VBOX_NEWER_VCC_TOOL_STEM)X86
    85328531 TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.amd64  = $(VBOX_NEWER_VCC_TOOL_STEM)AMD64
    85338532 TEMPLATE_NewerVccVBoxGuestR3Dll_CXXFLAGS        = \
    8534         $(filter-out $(VBOX_VCC_WARN_ALL) $(VBOX_VCC_WERR), $(TEMPLATE_VBOXGUESTR3DLL_CXXFLAGS)) \
     8533        $(filter-out $(VBOX_VCC_WARN_ALL) $(VBOX_VCC_WERR), $(TEMPLATE_VBoxGuestR3DllNonPedantic_CXXFLAGS)) \
    85358534        $(VBOX_NEWER_VCC_WARN_ALL) $(VBOX_VCC_WERR)
    8536  TEMPLATE_NewerVccVBoxGuestR3Dll_CFLAGS          = $(TEMPLATE_NewerVccVBOXGUESTR3DLL_CXXFLAGS)
     8535 TEMPLATE_NewerVccVBoxGuestR3Dll_CFLAGS          = $(TEMPLATE_NewerVccVBoxGuestR3DllNonPedantic_CXXFLAGS)
    85378536 ifndef VBOX_WITH_NOCRT_STATIC
    85388537# Hack begin
    85398538# Does not work when building x86 for amd64 build (No rule to make target /oldnames.lib).
    85408539# TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86        = \
    8541 #       $(subst $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3DLL_TOOL.win.x86)_LIB),$(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.x86)_LIB), $(TEMPLATE_VBOXGUESTR3DLL_LIBS.x86))
     8540#       $(subst $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3DllNonPedantic_TOOL.win.x86)_LIB),$(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.x86)_LIB), $(TEMPLATE_VBoxGuestR3DllNonPedantic_LIBS.x86))
    85428541# TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.amd64      = \
    8543 #       $(subst $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3DLL_TOOL.win.amd64)_LIB),$(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.amd64)_LIB), $(TEMPLATE_VBOXGUESTR3DLL_LIBS.amd64))
     8542#       $(subst $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3DllNonPedantic_TOOL.win.amd64)_LIB),$(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.amd64)_LIB), $(TEMPLATE_VBoxGuestR3DllNonPedantic_LIBS.amd64))
    85448543# Directly assign TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.
    85458544  TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86           = \
     
    85548553# Hack end
    85558554endif
     8555TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS             = \
     8556        $(TEMPLATE_VBoxGuestR3ExeBase_LIBS)
    85568557
    85578558#
     
    86908691TEMPLATE_VBOXGUESTR3XF86MOD_LIBS  = \
    86918692        $(VBOX_LIB_VBGL_R3_XFREE86)
    8692 TEMPLATE_VBOXGUESTR3XF86MOD_DEFS  = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) VBOX_GUESTR3XF86MOD RTMEM_NO_WRAP_TO_EF_APIS
     8693TEMPLATE_VBOXGUESTR3XF86MOD_DEFS  = $(TEMPLATE_VBoxGuestR3ExeBase_DEFS) VBOX_GUESTR3XF86MOD RTMEM_NO_WRAP_TO_EF_APIS
    86938694
    86948695
     
    87038704#
    87048705# Template for X.org guest modules (shared libs).
    8705 # This mostly about zapping unnecessary LIBS from VBOXGUESTR3DLL and adding some flags.
     8706# This mostly about zapping unnecessary LIBS from VBoxGuestR3DllNonPedantic and adding some flags.
    87068707#
    87078708TEMPLATE_VBOXGUESTR3XORGMOD       = VBox X.org Guest Module
    8708 TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBOXGUESTR3DLL
     8709TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBoxGuestR3DllNonPedantic
    87098710TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE)     = $(NO_SUCH_VARIABLE)
    87108711TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET)   = $(NO_SUCH_VARIABLE)
    8711 TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBOXGUESTR3DLL_CFLAGS)) -std=c99
    8712 TEMPLATE_VBOXGUESTR3XORGMOD_CXXFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBOXGUESTR3DLL_CXXFLAGS))
     8712TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_CFLAGS)) -std=c99
     8713TEMPLATE_VBOXGUESTR3XORGMOD_CXXFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_CXXFLAGS))
    87138714if1of ($(KBUILD_TARGET), linux)
    87148715 TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS += -Wno-conversion -Wno-unused-parameter
    87158716endif
    8716 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS
     8717TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBoxGuestR3DllNonPedantic_DEFS) VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS
    87178718ifeq ($(KBUILD_TARGET_ARCH),amd64)
    87188719 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64
    87198720endif
    8720 TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS),$(TEMPLATE_VBOXGUESTR3DLL_LDFLAGS))
     8721TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_LDFLAGS))
    87218722TEMPLATE_VBOXGUESTR3XORGMOD_LIBS = \
    87228723        $(VBOX_LIB_VBGL_R3_XORG)
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