Changeset 9632 in vbox
- Timestamp:
- Jun 11, 2008 8:33:24 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 17 edited
-
Config.kmk (modified) (5 diffs)
-
src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk (modified) (3 diffs)
-
src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk (modified) (4 diffs)
-
src/VBox/Additions/WINNT/Graphics/Miniport/Mirror/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Additions/WINNT/Graphics/OpenGL/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Additions/WINNT/Graphics/OpenGL/test/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Additions/WINNT/MouseFilter/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Additions/WINNT/VBoxControl/Makefile.kmk (modified) (1 diff)
-
src/VBox/Additions/WINNT/VBoxGINA/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Additions/WINNT/VBoxGuest/Makefile.kmk (modified) (8 diffs)
-
src/VBox/Additions/WINNT/VBoxHook/Makefile.kmk (modified) (1 diff)
-
src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk (modified) (1 diff)
-
src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Additions/WINNT/i8042prt/Makefile.kmk (modified) (3 diffs)
-
src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (3 diffs)
-
src/VBox/Additions/x11/xclient/Makefile.kmk (modified) (1 diff)
-
src/VBox/Runtime/Makefile.kmk (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r9630 r9632 301 301 # VBOX_WITH_64_BITS_GUESTS = 1 302 302 endif 303 # Enable building 64-bit additions (actually KBUILD_TARGET_ARCH decides). 304 VBOX_WITH_64BIT_ADDITIONS = 1 303 305 304 306 305 # … … 2581 2580 2582 2581 2583 ifndef VBOX_WITH_64BIT_ADDITIONS2584 2585 #2586 # Template for building R3 win32 guest additions.2587 #2588 TEMPLATE_VBOXW32GUESTR3 = VBox Win32 Guest Program2589 TEMPLATE_VBOXW32GUESTR3_INST = $(INST_ADDITIONS)2590 TEMPLATE_VBOXW32GUESTR3_BLD_TRG = win2591 TEMPLATE_VBOXW32GUESTR3_BLD_TRG_ARCH = x862592 TEMPLATE_VBOXW32GUESTR3_BLD_TRG_CPU = i3862593 TEMPLATE_VBOXW32GUESTR3_DEFS = IN_GUEST IN_GUEST_R3 IN_RING3 IN_RT_R3 __WIN32__ __WIN__ HC_ARCH_BITS=32 $(VBOX_GC_ARCH_BITS_DEFS)2594 TEMPLATE_VBOXW32GUESTR3_RCDEFS = \2595 VBOX_VERSION_MAJOR=\"$(VBOX_VERSION_MAJOR)\" \2596 VBOX_VERSION_MINOR=\"$(VBOX_VERSION_MINOR)\" \2597 VBOX_VERSION_BUILD=\"$(VBOX_VERSION_BUILD)\" \2598 VBOX_SVN_REV=\"$(VBOX_SVN_REV)\" \2599 VBOX_VERSION_MAJOR_NR=$(VBOX_VERSION_MAJOR) \2600 VBOX_VERSION_MINOR_NR=$(VBOX_VERSION_MINOR) \2601 VBOX_VERSION_BUILD_NR=$(VBOX_VERSION_BUILD) \2602 VBOX_SVN_REV_NR=$(VBOX_SVN_REV)2603 TEMPLATE_VBOXW32GUESTR3_ASTOOL = YASM2604 TEMPLATE_VBOXW32GUESTR3_ASFLAGS = -f win32 -DASM_FORMAT_PE -D__YASM__ -w+orphan-labels2605 TEMPLATE_VBOXW32GUESTR3_DLLSUFF = .dll2606 TEMPLATE_VBOXW32GUESTR3_EXESUFF = .exe2607 TEMPLATE_VBOXW32GUESTR3_LIBSUFF = .lib2608 TEMPLATE_VBOXW32GUESTR3_ARLIBSUFF = .lib2609 TEMPLATE_VBOXW32GUESTR3_SDKS = WIN32SDK W2K3DDKX862610 ifdef VBOX_USE_VCC802611 TEMPLATE_VBOXW32GUESTR3_TOOL = VCC80X862612 TEMPLATE_VBOXW32GUESTR3_CXXFLAGS = -Zi -Zl -GR- -EHs-c- -GF- -MT -U__LINUX__ -U__OS2__ -W3 -wd4996 -Zc:wchar_t-2613 TEMPLATE_VBOXW32GUESTR3_CXXFLAGS.debug = -RTCsu2614 TEMPLATE_VBOXW32GUESTR3_CXXFLAGS.release = -O2 -Oy- -GS-2615 else2616 TEMPLATE_VBOXW32GUESTR3_TOOL = VCC702617 TEMPLATE_VBOXW32GUESTR3_CXXFLAGS = -Zi -Zl -GR- -GX- -GF- -MT -U__LINUX__ -U__OS2__ -W32618 TEMPLATE_VBOXW32GUESTR3_CXXFLAGS.debug = -GZ2619 TEMPLATE_VBOXW32GUESTR3_CXXFLAGS.release = -Ogitb2 -Oy-2620 endif2621 TEMPLATE_VBOXW32GUESTR3_CXXFLAGS.profile = $(TEMPLATE_VBOXW32GUESTR3_CXXFLAGS.release)2622 TEMPLATE_VBOXW32GUESTR3_CXXFLAGS.kprofile = $(TEMPLATE_VBOXW32GUESTR3_CXXFLAGS.release)2623 TEMPLATE_VBOXW32GUESTR3_CFLAGS = $(TEMPLATE_VBOXW32GUESTR3_CXXFLAGS)2624 TEMPLATE_VBOXW32GUESTR3_CFLAGS.debug = $(TEMPLATE_VBOXW32GUESTR3_CXXFLAGS.debug)2625 TEMPLATE_VBOXW32GUESTR3_CFLAGS.release = $(TEMPLATE_VBOXW32GUESTR3_CXXFLAGS.release)2626 TEMPLATE_VBOXW32GUESTR3_CFLAGS.profile = $(TEMPLATE_VBOXW32GUESTR3_CXXFLAGS.profile)2627 TEMPLATE_VBOXW32GUESTR3_CFLAGS.kprofile = $(TEMPLATE_VBOXW32GUESTR3_CXXFLAGS.kprofile)2628 TEMPLATE_VBOXW32GUESTR3_INCS = \2629 $(VBOX_PATH_SDK)/include2630 TEMPLATE_VBOXW32GUESTR3_LDFLAGS = \2631 /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LARGEADDRESSAWARE \2632 /DISALLOWLIB:libc.lib \2633 /DISALLOWLIB:libcd.lib \2634 /DISALLOWLIB:msvcrt.lib \2635 /DISALLOWLIB:libcmtd.lib \2636 /DISALLOWLIB:msvcrtd.lib2637 ifdef VBOX_USE_VCC802638 TEMPLATE_VBOXW32GUESTR3_LIBS = \2639 $(PATH_TOOL_VCC80X86_LIB)/oldnames.lib \2640 $(PATH_TOOL_VCC80X86_LIB)/libcmt.lib \2641 $(PATH_SDK_W2K3DDKX86_LIB)/ntdll.lib2642 else2643 TEMPLATE_VBOXW32GUESTR3_LIBS = \2644 $(PATH_TOOL_VCC70_LIB)/oldnames.lib \2645 $(PATH_TOOL_VCC70_LIB)/libcmt.lib \2646 $(PATH_SDK_W2K3DDKX86_LIB)/ntdll.lib2647 endif2648 TEMPLATE_VBOXW32GUESTR3_POST_CMDS = $(VBOX_SIGN_IMAGE_CMDS)2649 2650 #2651 # R3 win32 guest libraries2652 #2653 TEMPLATE_VBOXW32GUESTR3LIB = VBox Win32 Guest User Libraries2654 TEMPLATE_VBOXW32GUESTR3LIB_EXTENDS = VBOXW32GUESTR32655 TEMPLATE_VBOXW32GUESTR3LIB_INST = $(INST_ADDITIONS_LIB)2656 2657 2658 #2659 # Template for building R0 win32 guest tools.2660 #2661 TEMPLATE_VBOXW32GUESTR0 = VBox Win32 Guest Driver2662 TEMPLATE_VBOXW32GUESTR0_INST = $(INST_ADDITIONS)2663 TEMPLATE_VBOXW32GUESTR0_BLD_TRG = win2664 TEMPLATE_VBOXW32GUESTR0_BLD_TRG_ARCH = x862665 TEMPLATE_VBOXW32GUESTR0_BLD_TRG_CPU = i3862666 TEMPLATE_VBOXW32GUESTR0_DEFS = _X86_ IN_GUEST IN_GUEST_R0 IN_RING0 IN_RT_R0 __WIN32__ __WIN__ HC_ARCH_BITS=32 $(VBOX_GC_ARCH_BITS_DEFS)2667 TEMPLATE_VBOXW32GUESTR0_RCDEFS = \2668 VBOX_VERSION_MAJOR=\"$(VBOX_VERSION_MAJOR)\" \2669 VBOX_VERSION_MINOR=\"$(VBOX_VERSION_MINOR)\" \2670 VBOX_VERSION_BUILD=\"$(VBOX_VERSION_BUILD)\" \2671 VBOX_SVN_REV=\"$(VBOX_SVN_REV)\" \2672 VBOX_VERSION_MAJOR_NR=$(VBOX_VERSION_MAJOR) \2673 VBOX_VERSION_MINOR_NR=$(VBOX_VERSION_MINOR) \2674 VBOX_VERSION_BUILD_NR=$(VBOX_VERSION_BUILD) \2675 VBOX_SVN_REV_NR=$(VBOX_SVN_REV)2676 TEMPLATE_VBOXW32GUESTR0_ASTOOL = YASM2677 TEMPLATE_VBOXW32GUESTR0_ASFLAGS = -f win32 -DASM_FORMAT_PE -D__YASM__ -w+orphan-labels2678 TEMPLATE_VBOXW32GUESTR0_SYSSUFF = .sys2679 ifdef VBOX_USE_VCC802680 TEMPLATE_VBOXW32GUESTR0_TOOL = VCC80X862681 TEMPLATE_VBOXW32GUESTR0_CXXFLAGS = -Zi -Zl -GR- -GS- -EHs-c- -GF- -Gz -U__LINUX__ -W3 -wd4996 -Zc:wchar_t-2682 TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.debug = -GR- -EHs-c- -Zl2683 TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.release = -O2 -Oy-2684 else2685 TEMPLATE_VBOXW32GUESTR0_TOOL = VCC702686 TEMPLATE_VBOXW32GUESTR0_CXXFLAGS = -Zi -Zl -GR- -GX- -GF- -Gz -U__LINUX__ -W32687 TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.debug = -GR- -GX- -Zl2688 TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.release = -Ogitb2 -Oy-2689 endif2690 TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.profile = $(TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.release)2691 TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.kprofile = $(TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.release)2692 TEMPLATE_VBOXW32GUESTR0_CFLAGS = $(TEMPLATE_VBOXW32GUESTR0_CXXFLAGS)2693 TEMPLATE_VBOXW32GUESTR0_CFLAGS.debug = $(TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.debug)2694 TEMPLATE_VBOXW32GUESTR0_CFLAGS.release = $(TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.release)2695 TEMPLATE_VBOXW32GUESTR0_CFLAGS.profile = $(TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.profile)2696 TEMPLATE_VBOXW32GUESTR0_CFLAGS.kprofile = $(TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.kprofile)2697 TEMPLATE_VBOXW32GUESTR0_LDFLAGS = \2698 -Driver -Subsystem:NATIVE -Incremental:NO -Align:32 -MapInfo:Exports -NoD -Machine:X86 -Debug \2699 /DISALLOWLIB:libcd.lib \2700 /DISALLOWLIB:msvcrt.lib \2701 /DISALLOWLIB:msvcrtd.lib \2702 /DISALLOWLIB:libcmtd.lib2703 TEMPLATE_VBOXW32GUESTR0_POST_CMDS = $(VBOX_SIGN_DRIVER_CMDS)2704 2705 #2706 # R0 win32 guest libraries2707 #2708 TEMPLATE_VBOXW32GUESTR0LIB = VBox Win32 Guest Driver2709 TEMPLATE_VBOXW32GUESTR0LIB_EXTENDS = VBOXW32GUESTR02710 TEMPLATE_VBOXW32GUESTR0LIB_INST = $(INST_ADDITIONS_LIB)2711 2712 endif # !VBOX_WITH_64BIT_ADDITIONS2713 2714 2582 # 2715 2583 # Windows rc workaround for crosscompiling. … … 2772 2640 TEMPLATE_VBOXGUESTR3EXE = VBox Guest Program 2773 2641 ifeq ($(KBUILD_TARGET),win) 2774 ifdef VBOX_WITH_64BIT_ADDITIONS 2775 TEMPLATE_VBOXGUESTR3EXE_EXTENDS = VBOXR3EXE 2776 TEMPLATE_VBOXGUESTR3EXE_CFLAGS = $(filter-out -MD, $(TEMPLATE_VBOXR3EXE_CFLAGS)) -MT 2777 TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS= $(filter-out -MD, $(TEMPLATE_VBOXR3EXE_CFLAGS)) -MT 2778 TEMPLATE_VBOXGUESTR3EXE_LDFLAGS = $(filter-out /DISALLOWLIB:libcmt.lib, $(TEMPLATE_VBOXR3EXE_LDFLAGS)) \ 2779 /DISALLOWLIB:msvcrt.lib \ 2780 /DISALLOWLIB:msvcprt.lib 2781 TEMPLATE_VBOXGUESTR3EXE_LIBS = \ 2782 $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL)_LIB)/oldnames.lib \ 2783 $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL)_LIB)/libcmt.lib \ 2784 $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL)_LIB)/libcpmt.lib 2785 else 2786 TEMPLATE_VBOXGUESTR3EXE_EXTENDS = VBOXW32GUESTR3 2787 endif 2642 TEMPLATE_VBOXGUESTR3EXE_EXTENDS = VBOXR3EXE 2643 TEMPLATE_VBOXGUESTR3EXE_CFLAGS = $(filter-out -MD, $(TEMPLATE_VBOXR3EXE_CFLAGS)) -MT 2644 TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS = $(filter-out -MD, $(TEMPLATE_VBOXR3EXE_CFLAGS)) -MT 2645 TEMPLATE_VBOXGUESTR3EXE_LDFLAGS = $(filter-out /DISALLOWLIB:libcmt.lib, $(TEMPLATE_VBOXR3EXE_LDFLAGS)) \ 2646 /DISALLOWLIB:msvcrt.lib \ 2647 /DISALLOWLIB:msvcprt.lib 2648 TEMPLATE_VBOXGUESTR3EXE_LIBS = \ 2649 $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL)_LIB)/oldnames.lib \ 2650 $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL)_LIB)/libcmt.lib \ 2651 $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL)_LIB)/libcpmt.lib 2788 2652 else # the gcc guys 2789 2653 TEMPLATE_VBOXGUESTR3EXE_EXTENDS = VBOXR3EXE 2790 ifdef VBOX_WITH_64BIT_ADDITIONS 2791 TEMPLATE_VBOXGUESTR3EXE_TOOL := $(subst GXX,GCC,$(TEMPLATE_VBOXR3EXE_TOOL)) 2792 else 2793 TEMPLATE_VBOXGUESTR3EXE_TOOL := $(subst GXX,GCC,$(VBOX_GCC32_TOOL)) 2794 endif 2654 TEMPLATE_VBOXGUESTR3EXE_TOOL := $(subst GXX,GCC,$(TEMPLATE_VBOXR3EXE_TOOL)) 2795 2655 TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -fno-exceptions 2796 2656 endif 2797 2657 TEMPLATE_VBOXGUESTR3EXE_INST = $(INST_ADDITIONS) 2798 ifdef VBOX_WITH_64BIT_ADDITIONS 2799 TEMPLATE_VBOXGUESTR3EXE_DEFS := $(TEMPLATE_VBOXR3EXE_DEFS) IN_GUEST IN_GUEST_R3 IN_RT_R3 2800 else 2801 TEMPLATE_VBOXGUESTR3EXE_ASFLAGS = $(VBOX_ASFLAGS32) 2802 TEMPLATE_VBOXGUESTR3EXE_BLD_TRG_ARCH = x86 2803 TEMPLATE_VBOXGUESTR3EXE_BLD_TRG_CPU = blend 2804 TEMPLATE_VBOXGUESTR3EXE_DEFS := IN_GUEST IN_GUEST_R3 IN_RT_R3 \ 2805 $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR3EXE_DEFS)) \ 2806 HC_ARCH_BITS=32 $(VBOX_GC_ARCH_BITS_DEFS) 2807 endif 2658 TEMPLATE_VBOXGUESTR3EXE_DEFS := $(TEMPLATE_VBOXR3EXE_DEFS) IN_GUEST IN_GUEST_R3 IN_RT_R3 2808 2659 if1of ($(KBUILD_TARGET),l4 linux) # As few libs as possible on linux. 2809 2660 TEMPLATE_VBOXGUESTR3EXE_LIBS = pthread rt m … … 2894 2745 TEMPLATE_VBOXGUESTR3CPPEXE_EXTENDS = VBOXGUESTR3EXE 2895 2746 ifeq ($(KBUILD_TARGET),win) 2896 # later 2897 else 2898 ifdef VBOX_WITH_64BIT_ADDITIONS 2899 TEMPLATE_VBOXGUESTR3CPPEXE_TOOL = $(TEMPLATE_VBOXR3EXE_TOOL) 2900 else 2901 TEMPLATE_VBOXGUESTR3CPPEXE_TOOL = $(VBOX_GCC32_TOOL) 2902 endif 2747 # later if necessary 2748 else 2749 TEMPLATE_VBOXGUESTR3CPPEXE_TOOL = $(TEMPLATE_VBOXR3EXE_TOOL) 2903 2750 TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) 2904 2751 endif … … 2911 2758 TEMPLATE_VBOXGUESTR0_EXTENDS = VBOXR0DRV 2912 2759 TEMPLATE_VBOXGUESTR0_INST = $(INST_ADDITIONS) 2913 ifdef VBOX_WITH_64BIT_ADDITIONS2914 2760 TEMPLATE_VBOXGUESTR0_SDKS.win.x86 = WIN32SDK W2K3DDK 2915 2761 TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = W2K3DDK WINPSDKINCS 2916 TEMPLATE_VBOXGUESTR0_LIBS.win.x86 2762 TEMPLATE_VBOXGUESTR0_LIBS.win.x86 = \ 2917 2763 $(PATH_SDK_W2K3DDK_LIB)/int64.lib 2918 else 2919 TEMPLATE_VBOXGUESTR0_SDKS.win.x86 = WIN32SDK W2K3DDKX86 2920 endif 2921 ifdef VBOX_WITH_64BIT_ADDITIONS 2922 TEMPLATE_VBOXGUESTR0_DEFS = $(TEMPLATE_VBOXR0DRV_DEFS) IN_GUEST IN_GUEST_R0 $(VBOX_GC_ARCH_BITS_DEFS) 2923 else 2924 ifn1of ($(KBUILD_TARGET),l4 linux) # must be same as the host. 2925 TEMPLATE_VBOXGUESTR0_DEFS = $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR0DRV_DEFS)) IN_GUEST IN_GUEST_R0 HC_ARCH_BITS=32 $(VBOX_GC_ARCH_BITS_DEFS) 2926 TEMPLATE_VBOXGUESTR0_BLD_TRG_ARCH = x86 2927 TEMPLATE_VBOXGUESTR0_BLD_TRG_CPU = blend 2928 else 2929 TEMPLATE_VBOXGUESTR0_DEFS = $(TEMPLATE_VBOXR0DRV_DEFS) IN_GUEST IN_GUEST_R0 2930 endif 2931 endif 2932 ifeq ($(KBUILD_TARGET),l4) # cross building linux on l4. 2933 TEMPLATE_VBOXGUESTR0_BLD_TRG = linux 2934 TEMPLATE_VBOXGUESTR0_SYSSUFF = .ko 2935 endif 2764 TEMPLATE_VBOXGUESTR0_DEFS = $(TEMPLATE_VBOXR0DRV_DEFS) IN_GUEST IN_GUEST_R0 2936 2765 ifeq ($(KBUILD_TARGET),solaris) # No VBI for the guest additions yet. 2937 2766 TEMPLATE_VBOXGUESTR0_LDFLAGS = -r -
trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk
r9507 r9632 25 25 26 26 SYSMODS += VBoxDisp 27 ifdef VBOX_WITH_64BIT_ADDITIONS28 27 VBoxDisp_TEMPLATE = VBOXGUESTR0 29 else30 VBoxDisp_TEMPLATE = VBOXW32GUESTR031 endif32 28 ifdef VBOX_SIGN_ADDITIONS 33 29 VBoxDisp_NOINST = true 34 30 endif 35 31 VBoxDisp_SYSSUFF = .dll 36 ifndef VBOX_WITH_64BIT_ADDITIONS37 VBoxDisp_SDKS = W2K3DDKX86 WINPSDKINCS38 endif39 32 VBoxDisp_DEFS = _WIN32_WINNT=0x0501 LOG_TO_BACKDOOR VBOX_WITH_DDRAW VBOX_WITH_OPENGL 40 33 VBoxDisp_INCS = ../../include … … 58 51 VBoxDisp.def \ 59 52 VBoxDisp.rc 60 ifdef VBOX_WITH_64BIT_ADDITIONS61 53 VBoxDisp_LDFLAGS.x86 = /Entry:DrvEnableDriver@12 62 54 VBoxDisp_LDFLAGS.amd64 = /Entry:DrvEnableDriver … … 64 56 $(PATH_SDK_W2K3DDK_LIB)/win32k.lib \ 65 57 $(VBOX_LIB_IPRT_GUEST_R0) 66 else 67 VBoxDisp_LDFLAGS = /Entry:DrvEnableDriver@12 68 VBoxDisp_LIBS = \ 69 $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib \ 70 $(PATH_SDK_W2K3DDKX86_LIB)/win32k.lib \ 71 $(PATH_LIB)/additions/RuntimeW32GuestR0$(VBOXW32GUEST_SUFF_LIB) 72 endif 73 ifndef VBOX_USE_VCC80 58 ifndef VBOX_USE_VCC80 ## @todo remove this! 74 59 VBoxDisp_LIBS += \ 75 60 $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/libcmt.lib 76 61 endif 77 62 78 79 63 include $(KBUILD_PATH)/subfooter.kmk 80 64 -
trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk
r9521 r9632 32 32 # 33 33 SYSMODS += VBoxVideo 34 ifdef VBOX_WITH_64BIT_ADDITIONS35 34 VBoxVideo_TEMPLATE = VBOXGUESTR0 36 else37 VBoxVideo_TEMPLATE = VBOXW32GUESTR038 VBoxVideo_SDKS = W2K3DDKX86 WINPSDKINCS39 endif40 35 ifdef VBOX_SIGN_ADDITIONS 41 36 VBoxVideo_NOINST = true … … 44 39 #VBoxVideo_DEFS += LOG_ENABLED 45 40 VBoxVideo_INCS = ../../include 46 ifdef VBOX_WITH_64BIT_ADDITIONS47 41 VBoxVideo_LDFLAGS.x86 = /Entry:DriverEntry@8 48 42 VBoxVideo_LDFLAGS.amd64 = /Entry:DriverEntry 49 else50 VBoxVideo_LDFLAGS = /Entry:DriverEntry@851 endif52 43 VBoxVideo_SOURCES = \ 53 44 VBoxVideo.cpp \ … … 55 46 VBoxVideo.def \ 56 47 VBoxVideo.rc 57 ifdef VBOX_WITH_64BIT_ADDITIONS58 48 VBoxVideo_LIBS.x86 = \ 59 49 $(PATH_SDK_W2K3DDK_LIB)/exsup.lib … … 64 54 $(VBOX_LIB_VBGL_R0) \ 65 55 $(VBOX_LIB_IPRT_GUEST_R0_NT4) 66 else67 VBoxVideo_LIBS = \68 $(PATH_SDK_W2K3DDKX86_LIB)/exsup.lib \69 $(PATH_SDK_W2K3DDKX86_LIB)/videoprt.lib \70 $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib \71 $(PATH_SDK_W2K3DDKX86_LIB)/ntoskrnl.lib \72 $(PATH_SDK_W2K3DDKX86_LIB)/hal.lib \73 $(PATH_LIB)/additions/VBoxGuestLib$(VBOXW32GUEST_SUFF_LIB) \74 $(PATH_LIB)/additions/RuntimeW32NT4GuestR0$(VBOXW32GUEST_SUFF_LIB)75 endif76 56 77 57 include $(KBUILD_PATH)/subfooter.kmk -
trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Mirror/Makefile.kmk
r9510 r9632 25 25 26 26 SYSMODS += vrdpvd 27 ifdef VBOX_WITH_64BIT_ADDITIONS28 27 vrdpvd_TEMPLATE = VBOXGUESTR0 29 else30 vrdpvd_TEMPLATE = VBOXW32GUESTR031 vrdpvd_SDKS = W2K3DDKX8632 endif33 28 #vrdpvd_DEFS += LOG_TO_BACKDOOR LOG_ENABLED 34 ifdef VBOX_WITH_64BIT_ADDITIONS35 29 vrdpvd_LDFLAGS.x86 = /Entry:DriverEntry@8 36 30 vrdpvd_LDFLAGS.amd64 = /Entry:DriverEntry 37 else38 vrdpvd_LDFLAGS = /Entry:DriverEntry@839 endif40 31 vrdpvd_SOURCES = \ 41 32 vrdpvd.c \ 42 33 helpers.c \ 43 34 vrdpvd.rc 44 ifdef VBOX_WITH_64BIT_ADDITIONS45 35 vrdpvd_LIBS = \ 46 36 $(PATH_SDK_W2K3DDK_LIB)/videoprt.lib \ … … 48 38 $(PATH_SDK_W2K3DDK_LIB)/hal.lib \ 49 39 $(VBOX_LIB_IPRT_GUEST_R0) 50 else51 vrdpvd_LIBS = \52 $(PATH_SDK_W2K3DDKX86_LIB)/videoprt.lib \53 $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib \54 $(PATH_SDK_W2K3DDKX86_LIB)/ntoskrnl.lib \55 $(PATH_SDK_W2K3DDKX86_LIB)/hal.lib \56 $(PATH_LIB)/additions/RuntimeW32GuestR0$(VBOXW32GUEST_SUFF_LIB)57 endif58 40 59 41 include $(KBUILD_PATH)/subfooter.kmk -
trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/Makefile.kmk
r9512 r9632 28 28 29 29 DLLS += VBoxOGL 30 ifdef VBOX_WITH_64BIT_ADDITIONS31 30 VBoxOGL_TEMPLATE = VBOXGUESTR3EXE 32 else33 VBoxOGL_TEMPLATE = VBOXW32GUESTR334 VBoxOGL_SDKS = W2K3DDKX8635 endif36 31 VBoxOGL_DEFS = VBOX_HGCM _WIN32_WINNT=0x0500 VBOX_OGL_GUEST_SIDE 37 32 VBoxOGL_SOURCES = \ … … 49 44 VBoxOGL.rc \ 50 45 VBoxOGL.def 51 ifdef VBOX_WITH_64BIT_ADDITIONS52 46 VBoxOGL_LIBS = \ 53 47 $(VBOX_LIB_IPRT_GUEST_R3) 54 else55 VBoxOGL_LIBS = \56 $(PATH_LIB)/additions/RuntimeW32GuestR3.lib57 endif58 48 59 49 include $(KBUILD_PATH)/subfooter.kmk -
trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/test/Makefile.kmk
r9511 r9632 25 25 26 26 ifdef VBOX_WITH_TESTCASES 27 27 28 # 28 29 # Structure size testcase. … … 30 31 PROGRAMS += tstShOpenGL tstOGLSample tstOGLSphere 31 32 32 ifdef VBOX_WITH_64BIT_ADDITIONS33 33 tstShOpenGL_TEMPLATE = VBOXGUESTR3EXE 34 else35 tstShOpenGL_TEMPLATE = VBOXW32GUESTR336 endif37 34 tstShOpenGL_DEFS = VBOX_HGCM 38 35 tstShOpenGL_SOURCES = tstShOpenGL.cpp 39 ifdef VBOX_WITH_64BIT_ADDITIONS40 36 tstShOpenGL_LIBS = $(PATH_SDK_WINPSDK_LIB)/opengl32.lib 41 else42 tstShOpenGL_LIBS = $(PATH_SDK_W2K3DDKX86_LIB)/opengl32.lib43 endif44 37 45 46 ifdef VBOX_WITH_64BIT_ADDITIONS47 38 tstOGLSample_TEMPLATE = VBOXGUESTR3EXE 48 else49 tstOGLSample_TEMPLATE = VBOXW32GUESTR350 endif51 39 tstOGLSample_DEFS = 52 40 tstOGLSample_SOURCES = tstOGLSample.cpp 53 ifdef VBOX_WITH_64BIT_ADDITIONS54 41 tstOGLSample_LIBS = $(PATH_SDK_WINPSDK_LIB)/opengl32.lib 55 else56 tstOGLSample_LIBS = $(PATH_SDK_W2K3DDKX86_LIB)/opengl32.lib57 endif58 42 59 60 ifdef VBOX_WITH_64BIT_ADDITIONS61 43 tstOGLSphere_TEMPLATE = VBOXGUESTR3EXE 62 else63 tstOGLSphere_TEMPLATE = VBOXW32GUESTR364 endif65 44 tstOGLSphere_DEFS = 66 45 tstOGLSphere_SOURCES = tstOGLSphere.c 67 ifdef VBOX_WITH_64BIT_ADDITIONS68 46 tstOGLSphere_LIBS = $(PATH_SDK_WINPSDK_LIB)/opengl32.lib 69 else70 tstOGLSphere_LIBS = $(PATH_SDK_W2K3DDKX86_LIB)/opengl32.lib71 endif72 47 73 48 endif # VBOX_WITH_TESTCASES -
trunk/src/VBox/Additions/WINNT/MouseFilter/Makefile.kmk
r9515 r9632 25 25 26 26 SYSMODS += VBoxMouse 27 ifdef VBOX_WITH_64BIT_ADDITIONS28 27 VBoxMouse_TEMPLATE = VBOXGUESTR0 29 else30 VBoxMouse_TEMPLATE = VBOXW32GUESTR031 VBoxMouse_SDKS = W2K3DDKX86 WINPSDKINCS32 endif33 28 VBoxMouse_DEFS = LOG_TO_BACKDOOR 34 29 #VBoxMouse_DEFS += LOG_ENABLED 35 30 VBoxMouse_CXXFLAGS = -Od 36 31 VBoxMouse_CFLAGS = -Od 37 ifdef VBOX_WITH_64BIT_ADDITIONS38 32 VBoxMouse_LDFLAGS.x86 = -Entry:DriverEntry@8 39 33 VBoxMouse_LDFLAGS.amd64 = -Entry:DriverEntry 40 else41 VBoxMouse_LDFLAGS = -Entry:DriverEntry@842 endif43 34 VBoxMouse_SOURCES = VBoxMouse.cpp \ 44 35 VBoxMouse.rc 45 ifdef VBOX_WITH_64BIT_ADDITIONS46 36 VBoxMouse_LIBS = \ 47 37 $(PATH_SDK_W2K3DDK_LIB)/win32k.lib \ … … 50 40 $(VBOX_LIB_IPRT_GUEST_R0) \ 51 41 $(VBOX_LIB_VBGL_R0) 52 else53 VBoxMouse_LIBS = \54 $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib \55 $(PATH_SDK_W2K3DDKX86_LIB)/win32k.lib \56 $(PATH_SDK_W2K3DDKX86_LIB)/ntoskrnl.lib \57 $(PATH_SDK_W2K3DDKX86_LIB)/hal.lib \58 $(PATH_LIB)/additions/VBoxGuestLib$(VBOXW32GUEST_SUFF_LIB) \59 $(PATH_LIB)/additions/RuntimeW32GuestR0$(VBOXW32GUEST_SUFF_LIB)60 endif61 42 62 43 # Inf2Cat refuses to sign this one complaining that it isn't an installation INF -
trunk/src/VBox/Additions/WINNT/VBoxControl/Makefile.kmk
r9517 r9632 25 25 26 26 PROGRAMS += VBoxControl 27 ifdef VBOX_WITH_64BIT_ADDITIONS28 27 VBoxControl_TEMPLATE = VBOXGUESTR3EXE 29 else30 VBoxControl_TEMPLATE = VBOXW32GUESTR331 endif32 28 ifdef VBOX_SIGN_ADDITIONS 33 29 VBoxControl_NOINST = true -
trunk/src/VBox/Additions/WINNT/VBoxGINA/Makefile.kmk
r9518 r9632 25 25 26 26 DLLS += VBoxGINA 27 ifdef VBOX_WITH_64BIT_ADDITIONS28 27 VBoxGINA_TEMPLATE = VBOXGUESTR3DLL 29 else30 VBoxGINA_TEMPLATE = VBOXW32GUESTR331 endif32 28 VBoxGINA_DEFS = UNICODE 33 29 VBoxGINA_SOURCES = \ … … 37 33 VBoxGINA.def \ 38 34 VBoxGINA.rc 39 ifdef VBOX_WITH_64BIT_ADDITIONS40 35 VBoxGINA_LIBS = \ 41 36 $(VBOX_LIB_IPRT_GUEST_R3) 42 else43 VBoxGINA_LIBS = \44 $(PATH_LIB)/additions/RuntimeW32GuestR3$(VBOXW32GUEST_SUFF_LIB)45 endif46 37 47 38 include $(KBUILD_PATH)/subfooter.kmk -
trunk/src/VBox/Additions/WINNT/VBoxGuest/Makefile.kmk
r9629 r9632 28 28 # 29 29 SYSMODS += VBoxGuest 30 ifdef VBOX_WITH_64BIT_ADDITIONS31 30 VBoxGuest_TEMPLATE = VBOXGUESTR0 32 else33 VBoxGuest_TEMPLATE = VBOXW32GUESTR034 VBoxGuest_SDKS = W2K3DDKX86 WINPSDKINCS35 endif36 31 ifdef VBOX_SIGN_ADDITIONS 37 32 VBoxGuest_NOINST = true … … 40 35 #VBoxGuest_DEFS += LOG_ENABLED 41 36 VBoxGuest_INCS = ../include 42 ifdef VBOX_WITH_64BIT_ADDITIONS43 37 VBoxGuest_LDFLAGS.x86 = -Entry:DriverEntry@8 44 38 VBoxGuest_LDFLAGS.amd64 = -Entry:DriverEntry 45 else46 VBoxGuest_LDFLAGS = -Entry:DriverEntry@847 endif48 39 VBoxGuest_SOURCES = \ 49 40 VBoxGuest.cpp \ … … 51 42 Helper.cpp \ 52 43 VBoxGuest.rc 53 ifdef VBOX_WITH_64BIT_ADDITIONS54 44 VBoxGuest_LIBS = \ 55 45 $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \ … … 58 48 $(VBOX_LIB_VBGL_R0BASE) \ 59 49 $(VBOX_LIB_IPRT_GUEST_R0) 60 else61 VBoxGuest_LIBS = \62 $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib \63 $(PATH_SDK_W2K3DDKX86_LIB)/win32k.lib \64 $(PATH_SDK_W2K3DDKX86_LIB)/ntoskrnl.lib \65 $(PATH_SDK_W2K3DDKX86_LIB)/hal.lib \66 $(PATH_LIB)/additions/VBoxGuestLibBase$(VBOXW32GUEST_SUFF_LIB) \67 $(PATH_LIB)/additions/RuntimeW32GuestR0$(VBOXW32GUEST_SUFF_LIB)68 endif69 50 70 51 … … 72 53 # VBoxGuestNT - NT version of the driver (x86 only). 73 54 # 74 ifdef VBOX_WITH_64BIT_ADDITIONS75 55 SYSMODS.x86 += VBoxGuestNT 76 56 ifeq (foo,disabled) … … 81 61 VBoxGuestNT_LDFLAGS.x86 = $(VBoxGuest_LDFLAGS.x86) 82 62 endif 83 else84 SYSMODS += VBoxGuestNT85 VBoxGuestNT_TEMPLATE = VBOXW32GUESTR086 VBoxGuestNT_SDKS = W2K3DDKX86 WINPSDKINCS87 VBoxGuestNT_INCS = $(VBoxGuest_INCS)88 VBoxGuestNT_LDFLAGS = $(VBoxGuest_LDFLAGS)89 endif90 63 VBoxGuestNT_DEFS = $(VBoxGuest_DEFS) TARGET_NT4 91 64 VBoxGuestNT_SOURCES = \ … … 94 67 NTLegacy.cpp \ 95 68 VBoxGuest.rc 96 ifdef VBOX_WITH_64BIT_ADDITIONS97 69 VBoxGuestNT_LIBS = \ 98 70 $(PATH_SDK_W2K3DDK_LIB)/exsup.lib \ … … 101 73 $(VBOX_LIB_VBGL_R0BASE) \ 102 74 $(VBOX_LIB_IPRT_GUEST_R0_NT4) 103 else104 VBoxGuestNT_LIBS = \105 $(PATH_SDK_W2K3DDKX86_LIB)/exsup.lib \106 $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib \107 $(PATH_SDK_W2K3DDKX86_LIB)/ntoskrnl.lib \108 $(PATH_SDK_W2K3DDKX86_LIB)/hal.lib \109 $(PATH_LIB)/additions/VBoxGuestLibBase$(VBOXW32GUEST_SUFF_LIB) \110 $(PATH_LIB)/additions/RuntimeW32NT4GuestR0$(VBOXW32GUEST_SUFF_LIB)111 endif112 75 113 76 # -
trunk/src/VBox/Additions/WINNT/VBoxHook/Makefile.kmk
r9519 r9632 28 28 29 29 DLLS += VBoxHook 30 ifdef VBOX_WITH_64BIT_ADDITIONS31 30 VBoxHook_TEMPLATE = VBOXGUESTR3DLL 32 else33 VBoxHook_TEMPLATE = VBOXW32GUESTR334 endif35 31 VBoxHook_INCS = ../include 36 32 VBoxHook_SOURCES = \ -
trunk/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk
r9519 r9632 30 30 PROGRAMS += tstHook 31 31 32 ifdef VBOX_WITH_64BIT_ADDITIONS33 32 tstHook_TEMPLATE = VBOXGUESTR3EXE 34 else35 tstHook_TEMPLATE = VBOXW32GUESTR336 endif37 33 tstHook_DEFS = VBOX_HGCM 38 34 tstHook_SOURCES = tstHook.cpp -
trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk
r9520 r9632 25 25 26 26 PROGRAMS += VBoxTray 27 ifdef VBOX_WITH_64BIT_ADDITIONS28 27 VBoxTray_TEMPLATE = VBOXGUESTR3EXE 29 else30 VBoxTray_TEMPLATE = VBOXW32GUESTR331 endif32 28 ifdef VBOX_SIGN_ADDITIONS 33 29 VBoxTray_NOINST = true … … 47 43 VBoxTray.rc 48 44 49 ifdef VBOX_WITH_64BIT_ADDITIONS50 45 VBoxTray_LIBS = \ 51 46 $(VBOX_LIB_IPRT_GUEST_R3) 52 else53 VBoxTray_LIBS = \54 $(PATH_LIB)/additions/RuntimeW32GuestR3.lib55 endif56 47 57 48 # VBoxTray.cpp uses VBOX_SVN_REV. -
trunk/src/VBox/Additions/WINNT/i8042prt/Makefile.kmk
r9514 r9632 25 25 26 26 27 ifdef VBOX_WITH_64BIT_ADDITIONS28 27 SYSMODS.x86 += VBoxMouseNT 29 28 VBoxMouseNT_TEMPLATE = VBOXGUESTR0 30 else31 SYSMODS += VBoxMouseNT32 VBoxMouseNT_TEMPLATE = VBOXW32GUESTR033 VBoxMouseNT_SDKS = W2K3DDKX86 WINPSDKINCS34 endif35 29 VBoxMouseNT_DEFS = LOG_TO_BACKDOOR 36 30 VBoxMouseNT_INCS = \ … … 48 42 moudep.c \ 49 43 i8042prt.rc 50 ifdef VBOX_WITH_64BIT_ADDITIONS51 44 VBoxMouseNT_LIBS = \ 52 45 $(PATH_SDK_W2K3DDK_LIB)/exsup.lib \ … … 55 48 $(VBOX_LIB_VBGL_R0) \ 56 49 $(VBOX_LIB_IPRT_GUEST_R0_NT4) 57 else58 VBoxMouseNT_LIBS = \59 $(PATH_SDK_W2K3DDKX86_LIB)/exsup.lib \60 $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib \61 $(PATH_SDK_W2K3DDKX86_LIB)/ntoskrnl.lib \62 $(PATH_SDK_W2K3DDKX86_LIB)/hal.lib \63 $(PATH_LIB)/additions/VBoxGuestLib$(VBOXW32GUEST_SUFF_LIB) \64 $(PATH_LIB)/additions/RuntimeW32NT4GuestR0$(VBOXW32GUEST_SUFF_LIB) \65 $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/libcmt.lib66 endif67 50 VBoxMouseNT_DEPS = \ 68 51 $(PATH_VBoxMouseNT)/i8042log.rc -
trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
r9500 r9632 27 27 # Target config. 28 28 # 29 ifn1of ($(KBUILD_TARGET)$(VBOX_WITH_64BIT_ADDITIONS), l4 linux win) 30 LIBRARIES += \ 29 LIBRARIES += \ 31 30 VBoxGuestR0Lib \ 32 31 VBoxGuestR0LibBase 33 32 LIBRARIES += \ 34 33 VBoxGuestR3Lib \ 35 34 VBoxGuestR3LibShared 36 37 35 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) 36 LIBRARIES += \ 38 37 VBoxGuestR3LibXFree86 39 endif40 else # This case is going to become obsolete with 64-bit guest additions.41 # As we build Windows Additions on Linux as well, we need a42 # separate Linux target for each library so that both platforms43 # are built.44 ifdef VBOX_WITH_WIN32_ADDITIONS45 ifndef VBOX_ADDITIONS_LINUX_ONLY46 LIBRARIES += \47 VBoxGuestLib \48 VBoxGuestLibBase49 endif50 endif51 ifdef VBOX_WITH_LINUX_ADDITIONS52 LIBRARIES += \53 VBoxGuestR0Lib \54 VBoxGuestR0LibBase \55 VBoxGuestR3Lib \56 VBoxGuestR3LibShared \57 VBoxGuestR3LibXFree8658 else ifdef VBOX_WITH_X11_ADDITIONS59 LIBRARIES += \60 VBoxGuestR3Lib \61 VBoxGuestR3LibShared \62 VBoxGuestR3LibXFree8663 endif64 38 endif 65 39 … … 119 93 VBoxGuestR3LibTime.cpp \ 120 94 VBoxGuestR3LibVideo.cpp 121 ifdef VBOX_WITH_64BIT_ADDITIONS ## @todo get rid of this hack. 122 ifeq ($(KBUILD_TARGET),win) 123 VBoxGuestR3Lib_SOURCES = VBoxGuestR3Lib.cpp 124 endif 95 ifeq ($(KBUILD_TARGET),win) ## @todo get rid of this hack. 96 VBoxGuestR3Lib_SOURCES = VBoxGuestR3Lib.cpp 125 97 endif 98 126 99 127 100 # … … 154 127 155 128 156 ifndef VBOX_WITH_64BIT_ADDITIONS157 158 #159 # VBoxGuestLib (Windows)160 #161 VBoxGuestLib_TEMPLATE = VBOXW32GUESTR0LIB162 VBoxGuestLib_SDKS.win = W2K3DDKX86 WIN32SDK163 VBoxGuestLib_SOURCES = $(VBoxGuestR0Lib_SOURCES)164 VBoxGuestLib_INCS = \165 $(PATH_VBoxGuestLib)166 VBoxGuestLib_INCS.win = \167 $(PATH_SUB_ROOT)/WINNT/SharedFolders/include168 VBoxGuestLib_DEFS = IN_RING0 IN_RT_R0 VBOX_HGCM LOG_TO_BACKDOOR169 #VBoxGuestLib_DEFS += LOG_ENABLED170 171 172 #173 # VBoxGuestLibBase (Windows)174 #175 VBoxGuestLibBase_TEMPLATE = VBOXW32GUESTR0LIB176 VBoxGuestLibBase_SDKS.win = $(VBoxGuestLib_SDKS.win)177 VBoxGuestLibBase_SOURCES = $(VBoxGuestR0LibBase_SOURCES)178 VBoxGuestLibBase_INCS = $(VBoxGuestLib_INCS)179 VBoxGuestLibBase_INCS.win = $(VBoxGuestLib_INCS.win)180 VBoxGuestLibBase_DEFS = $(VBoxGuestLib_DEFS) VBGL_VBOXGUEST181 VBoxGuestLibBase_DEFS.win = $(VBoxGuestLib_DEFS.win)182 #VBoxGuestLibBase_DEFS += LOG_ENABLED183 184 endif # VBOX_WITH_64BIT_ADDITIONS185 186 129 include $(KBUILD_PATH)/subfooter.kmk 187 130 -
trunk/src/VBox/Additions/x11/xclient/Makefile.kmk
r9553 r9632 72 72 $(call MSG_L1,Forcing static libstdc++) 73 73 $(QUIET)$(MKDIR) -p $(@D) 74 ifdef VBOX_WITH_64BIT_ADDITIONS75 74 $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \ 76 75 || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ 77 else78 $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ \79 || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@80 endif81 76 82 77 -
trunk/src/VBox/Runtime/Makefile.kmk
r9602 r9632 38 38 # Only build the additions, sort out the legacy names first. 39 39 # 40 ifeq ($(KBUILD_TARGET)$(VBOX_WITH_64BIT_ADDITIONS),win) 41 LIBRARIES = RuntimeW32GuestR0 RuntimeW32GuestR3 RuntimeW32NT4GuestR0 42 else 43 LIBRARIES = RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini 44 #LIBRARIES.os2 = RuntimeGuestR0OS2Warp3 45 LIBRARIES.win.x86 = RuntimeGuestR0NT4 46 ifndef VBOX_WITH_ADDITION_DRIVERS 47 if1of ($(KBUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0. 48 LIBRARIES := $(filter-out RuntimeGuestR0, $(LIBRARIES)) 49 endif 40 LIBRARIES = RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini 41 #LIBRARIES.os2 = RuntimeGuestR0OS2Warp3 42 LIBRARIES.win.x86 = RuntimeGuestR0NT4 43 ifndef VBOX_WITH_ADDITION_DRIVERS 44 if1of ($(KBUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0. 45 LIBRARIES := $(filter-out RuntimeGuestR0, $(LIBRARIES)) 50 46 endif 51 47 endif … … 64 60 endif 65 61 ifdef VBOX_WITH_ADDITIONS 66 ifdef VBOX_WITH_WIN32_ADDITIONS 67 ifndef VBOX_WITH_64BIT_ADDITIONS 68 LIBRARIES += RuntimeW32GuestR0 RuntimeW32GuestR3 RuntimeW32NT4GuestR0 69 endif 70 endif 71 ifneq ($(KBUILD_TARGET)$(VBOX_WITH_64BIT_ADDITIONS),win) 72 LIBRARIES += RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini 73 #LIBRARIES.os2 = RuntimeGuestR0OS2Warp3 74 LIBRARIES.win.x86 = RuntimeGuestR0NT4 75 ifndef VBOX_WITH_ADDITION_DRIVERS 76 if1of ($(KBUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0. 77 LIBRARIES := $(filter-out RuntimeGuestR0, $(LIBRARIES)) 78 endif 62 LIBRARIES += RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini 63 #LIBRARIES.os2 = RuntimeGuestR0OS2Warp3 64 LIBRARIES.win.x86 = RuntimeGuestR0NT4 65 ifndef VBOX_WITH_ADDITION_DRIVERS 66 if1of ($(KBUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0. 67 LIBRARIES := $(filter-out RuntimeGuestR0, $(LIBRARIES)) 79 68 endif 80 69 endif … … 568 557 RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) 569 558 RuntimeGuestR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH)) 570 ifndef VBOX_WITH_64BIT_ADDITIONS571 RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).x86 := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).x86)572 RuntimeGuestR3_SOURCES.$(KBUILD_HOST).x86 := $(RuntimeR3_SOURCES.$(KBUILD_HOST).x86)573 endif574 559 575 560 … … 632 617 # RuntimeW32GuestR3 - Win32 guest program runtime. 633 618 # 634 ifdef VBOX_WITH_64BIT_ADDITIONS 635 RuntimeW32GuestR3_TEMPLATE = VBOXGUESTR3LIB 636 else 637 RuntimeW32GuestR3_TEMPLATE = VBOXW32GUESTR3LIB 638 endif 619 RuntimeW32GuestR3_TEMPLATE = VBOXGUESTR3LIB 639 620 RuntimeW32GuestR3_SDKS = WINPSDK W2K3DDK 640 621 RuntimeW32GuestR3_DEFS = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX … … 1191 1172 RuntimeGuestR0_SOURCES := $(filter-out generic/RTLogWriteUser-generic.cpp, $(RuntimeR0Drv_SOURCES)) 1192 1173 RuntimeGuestR0_SOURCES += VBox/logbackdoor.cpp 1193 ifdef VBOX_WITH_64BIT_ADDITIONS 1194 RuntimeGuestR0_EXTENDS = RuntimeR0Drv 1195 else 1196 RuntimeGuestR0_SDKS.win := W2K3DDKX86 WINPSDKINCS 1197 RuntimeGuestR0_DEFS := $(RuntimeR0Drv_DEFS) 1198 RuntimeGuestR0_DEFS.$(KBUILD_TARGET) := $(RuntimeR0Drv_DEFS.$(KBUILD_TARGET)) 1199 RuntimeGuestR0_INCS := $(PATH_SUB_CURRENT) include 1200 RuntimeGuestR0_INCS.$(KBUILD_TARGET) := $(RuntimeR0Drv_INCS.$(KBUILD_TARGET)) 1201 RuntimeGuestR0_SOURCES.$(KBUILD_TARGET) := $(RuntimeR0Drv_SOURCES.$(KBUILD_TARGET)) 1202 RuntimeGuestR0_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR0Drv_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) 1203 ## @todo this deosn't belong here, but in RuntimeR0Drv. 1204 RuntimeGuestR0_SOURCES.freebsd += \ 1205 common/string/memset.cpp \ 1206 common/string/memcmp.cpp \ 1207 common/string/strchr.asm 1208 endif 1174 RuntimeGuestR0_EXTENDS = RuntimeR0Drv 1209 1175 1210 1176 # HACK: no vbi for the solaris guest additions - yet. … … 1249 1215 RuntimeGuestR0NT4_EXTENDS_BY = appending 1250 1216 RuntimeGuestR0NT4_DEFS = IPRT_TARGET_NT4 1251 1252 1253 ## @todo remove this1254 RuntimeOS2GuestR0_TEMPLATE = VBOXOS2GUESTR0LIB1255 RuntimeOS2GuestR0_SOURCES = \1256 $(filter-out common/misc/assert.cpp generic/RTLogWriteUser-generic.cpp,$(RuntimeR0Drv_SOURCES)) \1257 $(RuntimeR0Drv_SOURCES.os2) \1258 VBox/logbackdoor.cpp1259 1260 #1261 # RuntimeW32GuestR0 - Win32 guest driver runtime.1262 #1263 ifdef VBOX_WITH_64BIT_ADDITIONS1264 RuntimeW32GuestR0_TEMPLATE = VBOXGUESTR0LIB1265 else1266 RuntimeW32GuestR0_TEMPLATE = VBOXW32GUESTR0LIB1267 endif1268 1269 RuntimeW32GuestR0_SDKS = W2K3DDKX86 WINPSDKINCS1270 RuntimeW32GuestR0_INCS := $(PATH_SUB_CURRENT) include1271 RuntimeW32GuestR0_DEFS = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS IN_SUP_R01272 RuntimeW32GuestR0_DEFS.$(KBUILD_TARGET) =1273 RuntimeW32GuestR0_SOURCES = \1274 $(filter-out generic/RTLogWriteUser-generic.cpp,$(RuntimeR0Drv_SOURCES)) \1275 $(RuntimeR0Drv_SOURCES.win) \1276 VBox/logbackdoor.cpp1277 ifdef VBOX_USE_VCC801278 ## @todo use the .asm versions of these.1279 RuntimeW32GuestR0_SOURCES += \1280 common/string/memchr.cpp \1281 common/string/memcpy.cpp \1282 common/string/memset.cpp \1283 common/string/memmove.asm \1284 common/string/strlen.asm1285 endif1286 1287 1288 #1289 # RuntimeW32NT4GuestR0 - Win32 NT4 guest driver runtime.1290 #1291 RuntimeW32NT4GuestR0_EXTENDS = RuntimeW32GuestR01292 RuntimeW32NT4GuestR0_EXTENDS_BY = appending1293 RuntimeW32NT4GuestR0_DEFS = IPRT_TARGET_NT41294 1217 1295 1218
Note:
See TracChangeset
for help on using the changeset viewer.
