- Timestamp:
- Jan 22, 2023 1:36:11 PM (21 months ago)
- File:
-
- 1 edited
-
trunk/Config.kmk (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r98205 r98209 8454 8454 8455 8455 # 8456 # Template for building R3 (dynamic) libraries for the guest additions .8457 # 8458 TEMPLATE_VB OXGUESTR3DLL = VBox Guest User Dynamic Libraries8459 TEMPLATE_VB OXGUESTR3DLL_EXTENDS= VBoxGuestR3ExeBase8456 # Template for building R3 (dynamic) libraries for the guest additions, relaxed. 8457 # 8458 TEMPLATE_VBoxGuestR3DllNonPedantic := VBox Guest User Dynamic Libraries w/ IPRT and VBGL, non-pedantic. 8459 TEMPLATE_VBoxGuestR3DllNonPedantic_EXTENDS := VBoxGuestR3ExeBase 8460 8460 ## @todo add a INSTFUN that separates dlls and libs. 8461 8461 ifeq ($(KBUILD_TARGET),win) 8462 8462 ifeq ($(KBUILD_TYPE),asan) 8463 TEMPLATE_VB OXGUESTR3DLL_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_VB OXGUESTR3DLL_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))) 8465 8465 endif 8466 8466 else 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 8471 endif 8472 TEMPLATE_VBoxGuestR3DllNonPedantic_LIBS = \ 8487 8473 $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \ 8488 8474 $(VBOX_LIB_VBGL_R3_SHARED) \ 8489 8475 $(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 # 8481 TEMPLATE_VBoxGuestR3Dll := VBox Guest User Dynamic Libraries w/ IPRT and VBGL. 8482 TEMPLATE_VBoxGuestR3Dll_EXTENDS := VBoxGuestR3DllNonPedantic 8483 ifeq ($(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) 8487 else 8488 TEMPLATE_VBoxGuestR3Dll_CFLAGS = $(TEMPLATE_VBoxGuestR3DllNonPedantic_CFLAGS) $(VBOX_GCC_WERR) 8489 TEMPLATE_VBoxGuestR3Dll_CXXFLAGS = $(TEMPLATE_VBoxGuestR3DllNonPedantic_CXXFLAGS) $(VBOX_GCC_WERR) 8490 endif 8492 8491 8493 8492 # … … 8526 8525 # Template for building normal R3 (dynamic) libraries for the guest additions with Visual C++ 2013 or later, strict. 8527 8526 # 8528 TEMPLATE_NewerVccVBoxGuestR3Dll = VB OXGUESTR3DLLwith the newer Visual C++ version (2013 or later).8529 TEMPLATE_NewerVccVBoxGuestR3Dll_EXTENDS = VB OXGUESTR3DLL8527 TEMPLATE_NewerVccVBoxGuestR3Dll = VBoxGuestR3DllNonPedantic with the newer Visual C++ version (2013 or later). 8528 TEMPLATE_NewerVccVBoxGuestR3Dll_EXTENDS = VBoxGuestR3DllNonPedantic 8530 8529 if "$(KBUILD_TARGET)" == "win" && "$(VBOX_NEWER_VCC_TOOL_STEM)" != "$(VBOX_VCC_TOOL_STEM)" 8531 8530 TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.x86 = $(VBOX_NEWER_VCC_TOOL_STEM)X86 8532 8531 TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.amd64 = $(VBOX_NEWER_VCC_TOOL_STEM)AMD64 8533 8532 TEMPLATE_NewerVccVBoxGuestR3Dll_CXXFLAGS = \ 8534 $(filter-out $(VBOX_VCC_WARN_ALL) $(VBOX_VCC_WERR), $(TEMPLATE_VB OXGUESTR3DLL_CXXFLAGS)) \8533 $(filter-out $(VBOX_VCC_WARN_ALL) $(VBOX_VCC_WERR), $(TEMPLATE_VBoxGuestR3DllNonPedantic_CXXFLAGS)) \ 8535 8534 $(VBOX_NEWER_VCC_WARN_ALL) $(VBOX_VCC_WERR) 8536 TEMPLATE_NewerVccVBoxGuestR3Dll_CFLAGS = $(TEMPLATE_NewerVccVB OXGUESTR3DLL_CXXFLAGS)8535 TEMPLATE_NewerVccVBoxGuestR3Dll_CFLAGS = $(TEMPLATE_NewerVccVBoxGuestR3DllNonPedantic_CXXFLAGS) 8537 8536 ifndef VBOX_WITH_NOCRT_STATIC 8538 8537 # Hack begin 8539 8538 # Does not work when building x86 for amd64 build (No rule to make target /oldnames.lib). 8540 8539 # TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86 = \ 8541 # $(subst $(PATH_TOOL_$(TEMPLATE_VB OXGUESTR3DLL_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)) 8542 8541 # TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.amd64 = \ 8543 # $(subst $(PATH_TOOL_$(TEMPLATE_VB OXGUESTR3DLL_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)) 8544 8543 # Directly assign TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS. 8545 8544 TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86 = \ … … 8554 8553 # Hack end 8555 8554 endif 8555 TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS = \ 8556 $(TEMPLATE_VBoxGuestR3ExeBase_LIBS) 8556 8557 8557 8558 # … … 8690 8691 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS = \ 8691 8692 $(VBOX_LIB_VBGL_R3_XFREE86) 8692 TEMPLATE_VBOXGUESTR3XF86MOD_DEFS = $(TEMPLATE_VB OXGUESTR3DLL_DEFS) VBOX_GUESTR3XF86MOD RTMEM_NO_WRAP_TO_EF_APIS8693 TEMPLATE_VBOXGUESTR3XF86MOD_DEFS = $(TEMPLATE_VBoxGuestR3ExeBase_DEFS) VBOX_GUESTR3XF86MOD RTMEM_NO_WRAP_TO_EF_APIS 8693 8694 8694 8695 … … 8703 8704 # 8704 8705 # Template for X.org guest modules (shared libs). 8705 # This mostly about zapping unnecessary LIBS from VB OXGUESTR3DLLand adding some flags.8706 # This mostly about zapping unnecessary LIBS from VBoxGuestR3DllNonPedantic and adding some flags. 8706 8707 # 8707 8708 TEMPLATE_VBOXGUESTR3XORGMOD = VBox X.org Guest Module 8708 TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VB OXGUESTR3DLL8709 TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBoxGuestR3DllNonPedantic 8709 8710 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) 8710 8711 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) 8711 TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VB OXGUESTR3DLL_CFLAGS)) -std=c998712 TEMPLATE_VBOXGUESTR3XORGMOD_CXXFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VB OXGUESTR3DLL_CXXFLAGS))8712 TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_CFLAGS)) -std=c99 8713 TEMPLATE_VBOXGUESTR3XORGMOD_CXXFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_CXXFLAGS)) 8713 8714 if1of ($(KBUILD_TARGET), linux) 8714 8715 TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS += -Wno-conversion -Wno-unused-parameter 8715 8716 endif 8716 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VB OXGUESTR3DLL_DEFS) VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS8717 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBoxGuestR3DllNonPedantic_DEFS) VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS 8717 8718 ifeq ($(KBUILD_TARGET_ARCH),amd64) 8718 8719 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64 8719 8720 endif 8720 TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS),$(TEMPLATE_VB OXGUESTR3DLL_LDFLAGS))8721 TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_LDFLAGS)) 8721 8722 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS = \ 8722 8723 $(VBOX_LIB_VBGL_R3_XORG)
Note:
See TracChangeset
for help on using the changeset viewer.

