Changeset 9642 in vbox
- Timestamp:
- Jun 12, 2008 12:41:39 AM (17 years ago)
- svn:sync-xref-src-repo-rev:
- 31969
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/Config.kmk ¶
r9639 r9642 2579 2579 2580 2580 # 2581 # Template for building Linux host tools (only for KBUILD_TARGET=l4) 2582 # 2583 TEMPLATE_VBOXLNXHOSTR3EXE = Template for building linux host programs .2581 # Template for building Linux host tools (only for KBUILD_TARGET=l4). 2582 # 2583 TEMPLATE_VBOXLNXHOSTR3EXE = Template for building linux host programs when targeting L4. 2584 2584 TEMPLATE_VBOXLNXHOSTR3EXE_INST = $(INST_BIN) 2585 2585 TEMPLATE_VBOXLNXHOSTR3EXE_BLD_TRG = linux … … 2610 2610 # Note: Make sure you don't break VBOXGUESTR3CPPEXE when changing this. 2611 2611 # 2612 # For the time being, we force 32-bitness onto this and related2613 # templates (via BLD_TRG_ARCH). When we start doing 64-bit guest2614 # however, they will be reverted to follow KBUILD_TARGET_ARCH.2615 # So, if someone sees any weirdness happening in a 64-bit build now,2616 # try do a 32-bit cross build (kmk KBUILD_TARGET_ARCH=x86) first. It2617 #2618 2612 TEMPLATE_VBOXGUESTR3EXE = VBox Guest Program 2619 2613 ifeq ($(KBUILD_TARGET),win) … … 2635 2629 TEMPLATE_VBOXGUESTR3EXE_INST = $(INST_ADDITIONS) 2636 2630 TEMPLATE_VBOXGUESTR3EXE_DEFS := $(TEMPLATE_VBOXR3EXE_DEFS) IN_GUEST IN_GUEST_R3 IN_RT_R3 2637 if 1of ($(KBUILD_TARGET),l4linux) # As few libs as possible on linux.2631 ifeq ($(KBUILD_TARGET),linux) # As few libs as possible on linux. 2638 2632 TEMPLATE_VBOXGUESTR3EXE_LIBS = pthread rt m 2639 2633 endif 2640 ifeq ($(KBUILD_TARGET),l4) # cross building linux on l4.2641 TEMPLATE_VBOXGUESTR3EXE_BLD_TRG = linux2642 TEMPLATE_VBOXGUESTR3EXE_DLLSUFF = .so2643 TEMPLATE_VBOXGUESTR3EXE_SYSSUFF = .ko2644 endif2645 2634 2646 2635 # 2647 2636 # Template for building R3 (dynamic) libraries for the guest additions. 2648 2637 # 2649 TEMPLATE_VBOXGUESTR3DLL = VBox Guest User Dynamic Libraries2650 TEMPLATE_VBOXGUESTR3DLL_EXTENDS = VBOXGUESTR3EXE2638 TEMPLATE_VBOXGUESTR3DLL = VBox Guest User Dynamic Libraries 2639 TEMPLATE_VBOXGUESTR3DLL_EXTENDS = VBOXGUESTR3EXE 2651 2640 ## @todo add a INSTFUN that separates dlls and libs. 2652 2641 ifn1of ($(KBUILD_TARGET), os2 win) 2653 TEMPLATE_VBOXGUESTR3DLL_DEFS 2654 TEMPLATE_VBOXGUESTR3DLL_CFLAGS 2655 TEMPLATE_VBOXGUESTR3DLL_CXXFLAGS 2656 TEMPLATE_VBOXGUESTR3DLL_LDFLAGS 2642 TEMPLATE_VBOXGUESTR3DLL_DEFS = $(TEMPLATE_VBOXGUESTR3EXE_DEFS) PIC 2643 TEMPLATE_VBOXGUESTR3DLL_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fPIC 2644 TEMPLATE_VBOXGUESTR3DLL_CXXFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fPIC -fno-exceptions 2645 TEMPLATE_VBOXGUESTR3DLL_LDFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_LDFLAGS) -fPIC 2657 2646 endif 2658 2647 … … 2660 2649 # Template for building R3 (static) libraries for the guest additions. 2661 2650 # 2662 TEMPLATE_VBOXGUESTR3LIB = VBox Guest User Libraries2663 TEMPLATE_VBOXGUESTR3LIB_EXTENDS = VBOXGUESTR3EXE2664 TEMPLATE_VBOXGUESTR3LIB_INST = $(INST_ADDITIONS_LIB)2651 TEMPLATE_VBOXGUESTR3LIB = VBox Guest User Libraries 2652 TEMPLATE_VBOXGUESTR3LIB_EXTENDS = VBOXGUESTR3EXE 2653 TEMPLATE_VBOXGUESTR3LIB_INST = $(INST_ADDITIONS_LIB) 2665 2654 if1of ($(KBUILD_TARGET), solaris) ## @todo r=bird: Fix the *R3Mini template to VBOXGUESTR3DLL and remove this hack. 2666 TEMPLATE_VBOXGUESTR3LIB_DEFS 2667 TEMPLATE_VBOXGUESTR3LIB_CFLAGS 2668 TEMPLATE_VBOXGUESTR3LIB_CXXFLAGS 2655 TEMPLATE_VBOXGUESTR3LIB_DEFS = $(TEMPLATE_VBOXGUESTR3EXE_DEFS) PIC 2656 TEMPLATE_VBOXGUESTR3LIB_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fPIC 2657 TEMPLATE_VBOXGUESTR3LIB_CXXFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fPIC -fno-exceptions 2669 2658 endif 2670 2659 … … 2674 2663 # This mostly about zapping the VBOXR3EXE linker flags and libraries. 2675 2664 # 2676 TEMPLATE_VBOXGUESTR3XF86MOD 2665 TEMPLATE_VBOXGUESTR3XF86MOD = VBox Guest Program with C++ library dependencies 2677 2666 TEMPLATE_VBOXGUESTR3XF86MOD_EXTENDS = VBOXGUESTR3EXE 2678 2667 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) 2679 2668 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) 2680 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.linux = $(NO_SUCH_VARIABLE)2681 2669 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) 2682 2670 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) 2683 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.linux = $(NO_SUCH_VARIABLE) 2684 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS = -r 2685 if1of ($(KBUILD_TARGET), freebsd linux l4 netbsd openbsd) # the gnu ld guys. 2671 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS = -r 2672 if1of ($(KBUILD_TARGET), dragonfly freebsd linux netbsd openbsd) # the gnu ld guys. 2686 2673 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release = -S 2687 2674 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86 = -m elf_i386 2688 2675 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64 = -m elf_x86_64 2689 2676 endif 2690 TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS 2691 TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS 2692 TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF 2693 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS 2677 TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-merge-constants -std=c99 2678 TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants 2679 TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o 2680 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS = \ 2694 2681 $(VBOX_LIB_VBGL_R3_XFREE86) 2695 TEMPLATE_VBOXGUESTR3XF86MOD_DEFS 2682 TEMPLATE_VBOXGUESTR3XF86MOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR 2696 2683 2697 2684 … … 2700 2687 # This mostly about zapping unnecessary LIBS from VBOXGUESTR3DLL and adding some flags. 2701 2688 # 2702 TEMPLATE_VBOXGUESTR3XORGMOD 2689 TEMPLATE_VBOXGUESTR3XORGMOD = VBox Guest Program with C++ library dependencies 2703 2690 TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBOXGUESTR3DLL 2704 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) 2705 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) 2706 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.linux = $(NO_SUCH_VARIABLE) 2691 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) 2692 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) 2707 2693 TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) -std=c99 2708 2694 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR 2709 if1of ($(KBUILD_TARGET), linux l4)2695 if1of ($(KBUILD_TARGET), linux) 2710 2696 TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_LDFLAGS) -s 2711 2697 endif … … 2720 2706 # (This is mostly about undoing what was done to C++ for VBOXGUESTR3EXE.) 2721 2707 # 2722 TEMPLATE_VBOXGUESTR3CPPEXE = VBox Guest Program with C++ library dependencies2723 TEMPLATE_VBOXGUESTR3CPPEXE_EXTENDS = VBOXGUESTR3EXE2708 TEMPLATE_VBOXGUESTR3CPPEXE = VBox Guest Program with C++ library dependencies 2709 TEMPLATE_VBOXGUESTR3CPPEXE_EXTENDS = VBOXGUESTR3EXE 2724 2710 ifeq ($(KBUILD_TARGET),win) 2725 2711 # later if necessary 2726 2712 else 2727 TEMPLATE_VBOXGUESTR3CPPEXE_TOOL = $(TEMPLATE_VBOXR3EXE_TOOL)2713 TEMPLATE_VBOXGUESTR3CPPEXE_TOOL = $(TEMPLATE_VBOXR3EXE_TOOL) 2728 2714 TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) 2729 2715 endif … … 2733 2719 # Template for building R0 drivers for the guest additions. 2734 2720 # 2735 TEMPLATE_VBOXGUESTR0 = VBox Guest Driver2736 TEMPLATE_VBOXGUESTR0_EXTENDS = VBOXR0DRV2737 TEMPLATE_VBOXGUESTR0_INST = $(INST_ADDITIONS)2721 TEMPLATE_VBOXGUESTR0 = VBox Guest Driver 2722 TEMPLATE_VBOXGUESTR0_EXTENDS = VBOXR0DRV 2723 TEMPLATE_VBOXGUESTR0_INST = $(INST_ADDITIONS) 2738 2724 TEMPLATE_VBOXGUESTR0_SDKS.win.x86 = WIN32SDK W2K3DDK 2739 2725 TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = W2K3DDK WINPSDKINCS 2740 2726 TEMPLATE_VBOXGUESTR0_LIBS.win.x86 = \ 2741 2727 $(PATH_SDK_W2K3DDK_LIB)/int64.lib 2742 TEMPLATE_VBOXGUESTR0_DEFS = $(TEMPLATE_VBOXR0DRV_DEFS) IN_GUEST IN_GUEST_R02728 TEMPLATE_VBOXGUESTR0_DEFS = $(TEMPLATE_VBOXR0DRV_DEFS) IN_GUEST IN_GUEST_R0 2743 2729 ifeq ($(KBUILD_TARGET),solaris) # No VBI for the guest additions yet. 2744 TEMPLATE_VBOXGUESTR0_LDFLAGS = -r2730 TEMPLATE_VBOXGUESTR0_LDFLAGS = -r 2745 2731 endif 2746 2732 … … 2748 2734 # Template for building R0 libraries for the guest additions. 2749 2735 # 2750 TEMPLATE_VBOXGUESTR0LIB = VBox Guest Driver Libraries2751 TEMPLATE_VBOXGUESTR0LIB_EXTENDS = VBOXGUESTR02752 TEMPLATE_VBOXGUESTR0LIB_INST = $(INST_ADDITIONS_LIB)2736 TEMPLATE_VBOXGUESTR0LIB = VBox Guest Driver Libraries 2737 TEMPLATE_VBOXGUESTR0LIB_EXTENDS = VBOXGUESTR0 2738 TEMPLATE_VBOXGUESTR0LIB_INST = $(INST_ADDITIONS_LIB) 2753 2739 2754 2740 … … 2757 2743 # The _MINI and _SHARED are both compiled as PIC and intended for linking into a .so/.dll/.dylib. 2758 2744 # 2759 VBOX_LIB_IPRT_GUEST_R3 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3$(VBOX_SUFF_LIB)2760 VBOX_LIB_IPRT_GUEST_R3_MINI = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Mini$(VBOX_SUFF_LIB)2761 VBOX_LIB_IPRT_GUEST_R0 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0$(VBOX_SUFF_LIB)2745 VBOX_LIB_IPRT_GUEST_R3 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3$(VBOX_SUFF_LIB) 2746 VBOX_LIB_IPRT_GUEST_R3_MINI = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Mini$(VBOX_SUFF_LIB) 2747 VBOX_LIB_IPRT_GUEST_R0 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0$(VBOX_SUFF_LIB) 2762 2748 ifeq ($(KBUILD_TARGET_ARCH),x86) 2763 VBOX_LIB_IPRT_GUEST_R0_NT4 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0NT4$(VBOX_SUFF_LIB)2764 else 2765 VBOX_LIB_IPRT_GUEST_R0_NT4 = $(VBOX_LIB_IPRT_GUEST_R0)2766 endif 2767 VBOX_LIB_VBGL_R3 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib$(VBOX_SUFF_LIB)2768 VBOX_LIB_VBGL_R3_XFREE86 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibXFree86$(VBOX_SUFF_LIB)2769 VBOX_LIB_VBGL_R3_SHARED = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibShared$(VBOX_SUFF_LIB)2770 VBOX_LIB_VBGL_R0BASE = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR0LibBase$(VBOX_SUFF_LIB)2771 VBOX_LIB_VBGL_R0 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR0Lib$(VBOX_SUFF_LIB)2749 VBOX_LIB_IPRT_GUEST_R0_NT4 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0NT4$(VBOX_SUFF_LIB) 2750 else 2751 VBOX_LIB_IPRT_GUEST_R0_NT4 = $(VBOX_LIB_IPRT_GUEST_R0) 2752 endif 2753 VBOX_LIB_VBGL_R3 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib$(VBOX_SUFF_LIB) 2754 VBOX_LIB_VBGL_R3_XFREE86 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibXFree86$(VBOX_SUFF_LIB) 2755 VBOX_LIB_VBGL_R3_SHARED = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibShared$(VBOX_SUFF_LIB) 2756 VBOX_LIB_VBGL_R0BASE = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR0LibBase$(VBOX_SUFF_LIB) 2757 VBOX_LIB_VBGL_R0 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR0Lib$(VBOX_SUFF_LIB) 2772 2758 2773 2759 -
TabularUnified trunk/src/VBox/Additions/Makefile.kmk ¶
r9639 r9642 2 2 ## @file 3 3 # Top-level makefile for the VirtualBox Guest Additions. 4 #5 # Cross building of the additions is generally done by remote building6 # by means of smbfs, cifs, VBOX_ONLY_ADDITIONS=1 and setting KBUILD_TARGET7 # to the desired target.8 #9 # Limited support for cross building the windows additions using wine10 # is provided. There are a couple of issues with the approach (lack of11 # signing, no VC++ 8 support, ++) that makes it unsuitable for releases.12 #13 # Building the linux additions as part of the l4 build is ok because14 # l4 is built on a linux platform. This is why we have to check if15 # KBUILD_TARGET is l4 or linux in some places, though most of the magic16 # is done in the templates (Config.kmk).17 4 # 18 5 … … 36 23 include $(KBUILD_PATH)/subheader.kmk 37 24 25 # 26 # Cross building of the additions is generally done by remote building 27 # by means of smbfs, cifs, VBOX_ONLY_ADDITIONS=1 and setting KBUILD_TARGET 28 # and KBUILD_TARGET_ARCH to the desired target and architecture. 29 # 30 # Limited support for cross building the windows additions using wine 31 # is provided. There are a couple of issues with the approach (lack of 32 # signing, no VC++ 8 support, ++) that makes it unsuitable for releases. 33 # 38 34 # 39 35 # Note! VBOX_WITH_ADDITIONS is checked for by our parent makefile. -
TabularUnified trunk/src/VBox/Additions/linux/Makefile.kmk ¶
r9252 r9642 24 24 include $(KBUILD_PATH)/subheader.kmk 25 25 26 # This can only be built on a real Linux system. 27 if1of ($(KBUILD_TARGET),linux l4) 28 include $(PATH_SUB_CURRENT)/module/Makefile.kmk 29 include $(PATH_SUB_CURRENT)/daemon/Makefile.kmk 30 include $(PATH_SUB_CURRENT)/sharedfolders/Makefile.kmk 31 endif 26 include $(PATH_SUB_CURRENT)/module/Makefile.kmk 27 include $(PATH_SUB_CURRENT)/daemon/Makefile.kmk 28 include $(PATH_SUB_CURRENT)/sharedfolders/Makefile.kmk 32 29 33 30 ifndef VBOX_OSE … … 39 36 40 37 VBOX_PATH_LINUX_ADDITION_INSTALLER := $(PATH_SUB_CURRENT)/installer 41 VBOX_PATH_X11_ADDITION_INSTALLER := $(PATH_ROOT)/src/VBox/Additions/x11/installer38 VBOX_PATH_X11_ADDITION_INSTALLER := $(PATH_ROOT)/src/VBox/Additions/x11/installer 42 39 43 40 include $(KBUILD_PATH)/subfooter.kmk -
TabularUnified trunk/src/VBox/Additions/x11/Makefile.kmk ¶
r8760 r9642 24 24 25 25 # Include sub-makefiles. 26 if1of ($(KBUILD_TARGET), freebsd l 4 linuxsolaris)26 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) 27 27 include $(PATH_SUB_CURRENT)/xclient/Makefile.kmk 28 28 include $(PATH_SUB_CURRENT)/xgraphics/Makefile.kmk -
TabularUnified trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk ¶
r9540 r9642 27 27 # vboxvideo_drv 28 28 # 29 if1of ($(KBUILD_TARGET), linux l4)29 if1of ($(KBUILD_TARGET), linux) 30 30 SYSMODS += vboxvideo_drv 31 31 vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD … … 103 103 vboxvideo_68.c \ 104 104 vboxutils_68.c 105 endif # target linux , l4105 endif # target linux 106 106 107 107 … … 116 116 DLLS += vboxvideo_drv_70 117 117 vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD 118 if1of ($(KBUILD_TARGET), l 4 linux)118 if1of ($(KBUILD_TARGET), linux) 119 119 vboxvideo_drv_70_CFLAGS += \ 120 120 -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) # template? -
TabularUnified trunk/src/VBox/Additions/x11/xmouse/Makefile.kmk ¶
r9540 r9642 28 28 # vboxmouse_drv 29 29 # 30 if1of ($(KBUILD_TARGET), linux l4)30 if1of ($(KBUILD_TARGET), linux) 31 31 SYSMODS += vboxmouse_drv 32 32 vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
Note:
See TracChangeset
for help on using the changeset viewer.