VirtualBox

Changeset 9632 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Jun 11, 2008 8:33:24 PM (17 years ago)
Author:
vboxsync
Message:

Removed the non-VBOX_WITH_64BIT_ADDITIONS bits.

Location:
trunk/src/VBox
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk

    r9507 r9632  
    2525
    2626SYSMODS += VBoxDisp
    27 ifdef VBOX_WITH_64BIT_ADDITIONS
    2827VBoxDisp_TEMPLATE    = VBOXGUESTR0
    29 else
    30 VBoxDisp_TEMPLATE    = VBOXW32GUESTR0
    31 endif
    3228ifdef VBOX_SIGN_ADDITIONS
    3329 VBoxDisp_NOINST     = true
    3430endif
    3531VBoxDisp_SYSSUFF     = .dll
    36 ifndef VBOX_WITH_64BIT_ADDITIONS
    37 VBoxDisp_SDKS        = W2K3DDKX86 WINPSDKINCS
    38 endif
    3932VBoxDisp_DEFS        = _WIN32_WINNT=0x0501 LOG_TO_BACKDOOR VBOX_WITH_DDRAW VBOX_WITH_OPENGL
    4033VBoxDisp_INCS        = ../../include
    … …  
    5851        VBoxDisp.def \
    5952        VBoxDisp.rc
    60 ifdef VBOX_WITH_64BIT_ADDITIONS
    6153VBoxDisp_LDFLAGS.x86   = /Entry:DrvEnableDriver@12
    6254VBoxDisp_LDFLAGS.amd64 = /Entry:DrvEnableDriver
    … …  
    6456        $(PATH_SDK_W2K3DDK_LIB)/win32k.lib \
    6557        $(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
     58ifndef VBOX_USE_VCC80 ## @todo remove this!
    7459VBoxDisp_LIBS       += \
    7560        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/libcmt.lib
    7661endif
    7762
    78 
    7963include $(KBUILD_PATH)/subfooter.kmk
    8064

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk

    r9521 r9632  
    3232#
    3333SYSMODS += VBoxVideo
    34 ifdef VBOX_WITH_64BIT_ADDITIONS
    3534VBoxVideo_TEMPLATE    = VBOXGUESTR0
    36 else
    37 VBoxVideo_TEMPLATE    = VBOXW32GUESTR0
    38 VBoxVideo_SDKS        = W2K3DDKX86 WINPSDKINCS
    39 endif
    4035ifdef VBOX_SIGN_ADDITIONS
    4136 VBoxVideo_NOINST     = true
    … …  
    4439#VBoxVideo_DEFS        += LOG_ENABLED
    4540VBoxVideo_INCS        = ../../include
    46 ifdef VBOX_WITH_64BIT_ADDITIONS
    4741VBoxVideo_LDFLAGS.x86   = /Entry:DriverEntry@8
    4842VBoxVideo_LDFLAGS.amd64 = /Entry:DriverEntry
    49 else
    50 VBoxVideo_LDFLAGS     = /Entry:DriverEntry@8
    51 endif
    5243VBoxVideo_SOURCES     = \
    5344        VBoxVideo.cpp \
    … …  
    5546        VBoxVideo.def \
    5647        VBoxVideo.rc
    57 ifdef VBOX_WITH_64BIT_ADDITIONS
    5848VBoxVideo_LIBS.x86    = \
    5949        $(PATH_SDK_W2K3DDK_LIB)/exsup.lib
    … …  
    6454        $(VBOX_LIB_VBGL_R0) \
    6555        $(VBOX_LIB_IPRT_GUEST_R0_NT4)
    66 else
    67 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 endif
    7656
    7757include $(KBUILD_PATH)/subfooter.kmk

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Mirror/Makefile.kmk

    r9510 r9632  
    2525
    2626SYSMODS += vrdpvd
    27 ifdef VBOX_WITH_64BIT_ADDITIONS
    2827vrdpvd_TEMPLATE    = VBOXGUESTR0
    29 else
    30 vrdpvd_TEMPLATE    = VBOXW32GUESTR0
    31 vrdpvd_SDKS        = W2K3DDKX86
    32 endif
    3328#vrdpvd_DEFS       += LOG_TO_BACKDOOR LOG_ENABLED
    34 ifdef VBOX_WITH_64BIT_ADDITIONS
    3529vrdpvd_LDFLAGS.x86   = /Entry:DriverEntry@8
    3630vrdpvd_LDFLAGS.amd64 = /Entry:DriverEntry
    37 else
    38 vrdpvd_LDFLAGS     = /Entry:DriverEntry@8
    39 endif
    4031vrdpvd_SOURCES     = \
    4132        vrdpvd.c \
    4233        helpers.c \
    4334        vrdpvd.rc
    44 ifdef VBOX_WITH_64BIT_ADDITIONS
    4535vrdpvd_LIBS        = \
    4636        $(PATH_SDK_W2K3DDK_LIB)/videoprt.lib \
    … …  
    4838        $(PATH_SDK_W2K3DDK_LIB)/hal.lib \
    4939        $(VBOX_LIB_IPRT_GUEST_R0)
    50 else
    51 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 endif
    5840
    5941include $(KBUILD_PATH)/subfooter.kmk

  • trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/Makefile.kmk

    r9512 r9632  
    2828
    2929DLLS += VBoxOGL
    30 ifdef VBOX_WITH_64BIT_ADDITIONS
    3130VBoxOGL_TEMPLATE    = VBOXGUESTR3EXE
    32 else
    33 VBoxOGL_TEMPLATE    = VBOXW32GUESTR3
    34 VBoxOGL_SDKS        = W2K3DDKX86
    35 endif
    3631VBoxOGL_DEFS        = VBOX_HGCM _WIN32_WINNT=0x0500 VBOX_OGL_GUEST_SIDE
    3732VBoxOGL_SOURCES     = \
    … …  
    4944        VBoxOGL.rc \
    5045        VBoxOGL.def
    51 ifdef VBOX_WITH_64BIT_ADDITIONS
    5246VBoxOGL_LIBS        = \
    5347        $(VBOX_LIB_IPRT_GUEST_R3)
    54 else
    55 VBoxOGL_LIBS        = \
    56         $(PATH_LIB)/additions/RuntimeW32GuestR3.lib
    57 endif
    5848
    5949include $(KBUILD_PATH)/subfooter.kmk

  • trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/test/Makefile.kmk

    r9511 r9632  
    2525
    2626ifdef VBOX_WITH_TESTCASES
     27
    2728#
    2829# Structure size testcase.
    … …  
    3031PROGRAMS += tstShOpenGL tstOGLSample tstOGLSphere
    3132
    32 ifdef VBOX_WITH_64BIT_ADDITIONS
    3333tstShOpenGL_TEMPLATE = VBOXGUESTR3EXE
    34 else
    35 tstShOpenGL_TEMPLATE = VBOXW32GUESTR3
    36 endif
    3734tstShOpenGL_DEFS     = VBOX_HGCM
    3835tstShOpenGL_SOURCES  = tstShOpenGL.cpp
    39 ifdef VBOX_WITH_64BIT_ADDITIONS
    4036tstShOpenGL_LIBS     = $(PATH_SDK_WINPSDK_LIB)/opengl32.lib
    41 else
    42 tstShOpenGL_LIBS     = $(PATH_SDK_W2K3DDKX86_LIB)/opengl32.lib
    43 endif
    4437
    45 
    46 ifdef VBOX_WITH_64BIT_ADDITIONS
    4738tstOGLSample_TEMPLATE = VBOXGUESTR3EXE
    48 else
    49 tstOGLSample_TEMPLATE = VBOXW32GUESTR3
    50 endif
    5139tstOGLSample_DEFS     =
    5240tstOGLSample_SOURCES  = tstOGLSample.cpp
    53 ifdef VBOX_WITH_64BIT_ADDITIONS
    5441tstOGLSample_LIBS     = $(PATH_SDK_WINPSDK_LIB)/opengl32.lib
    55 else
    56 tstOGLSample_LIBS     = $(PATH_SDK_W2K3DDKX86_LIB)/opengl32.lib
    57 endif
    5842
    59 
    60 ifdef VBOX_WITH_64BIT_ADDITIONS
    6143tstOGLSphere_TEMPLATE = VBOXGUESTR3EXE
    62 else
    63 tstOGLSphere_TEMPLATE = VBOXW32GUESTR3
    64 endif
    6544tstOGLSphere_DEFS     =
    6645tstOGLSphere_SOURCES  = tstOGLSphere.c
    67 ifdef VBOX_WITH_64BIT_ADDITIONS
    6846tstOGLSphere_LIBS     = $(PATH_SDK_WINPSDK_LIB)/opengl32.lib
    69 else
    70 tstOGLSphere_LIBS     = $(PATH_SDK_W2K3DDKX86_LIB)/opengl32.lib
    71 endif
    7247
    7348endif # VBOX_WITH_TESTCASES

  • trunk/src/VBox/Additions/WINNT/MouseFilter/Makefile.kmk

    r9515 r9632  
    2525
    2626SYSMODS += VBoxMouse
    27 ifdef VBOX_WITH_64BIT_ADDITIONS
    2827VBoxMouse_TEMPLATE    = VBOXGUESTR0
    29 else
    30 VBoxMouse_TEMPLATE    = VBOXW32GUESTR0
    31 VBoxMouse_SDKS        = W2K3DDKX86 WINPSDKINCS
    32 endif
    3328VBoxMouse_DEFS        = LOG_TO_BACKDOOR
    3429#VBoxMouse_DEFS       += LOG_ENABLED
    3530VBoxMouse_CXXFLAGS    = -Od
    3631VBoxMouse_CFLAGS      = -Od
    37 ifdef VBOX_WITH_64BIT_ADDITIONS
    3832VBoxMouse_LDFLAGS.x86   = -Entry:DriverEntry@8
    3933VBoxMouse_LDFLAGS.amd64 = -Entry:DriverEntry
    40 else
    41 VBoxMouse_LDFLAGS     = -Entry:DriverEntry@8
    42 endif
    4334VBoxMouse_SOURCES     = VBoxMouse.cpp \
    4435                        VBoxMouse.rc
    45 ifdef VBOX_WITH_64BIT_ADDITIONS
    4636VBoxMouse_LIBS        = \
    4737        $(PATH_SDK_W2K3DDK_LIB)/win32k.lib \
    … …  
    5040        $(VBOX_LIB_IPRT_GUEST_R0) \
    5141        $(VBOX_LIB_VBGL_R0)
    52 else
    53 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 endif
    6142
    6243# Inf2Cat refuses to sign this one complaining that it isn't an installation INF

  • trunk/src/VBox/Additions/WINNT/VBoxControl/Makefile.kmk

    r9517 r9632  
    2525
    2626PROGRAMS += VBoxControl
    27 ifdef VBOX_WITH_64BIT_ADDITIONS
    2827VBoxControl_TEMPLATE = VBOXGUESTR3EXE
    29 else
    30 VBoxControl_TEMPLATE = VBOXW32GUESTR3
    31 endif
    3228ifdef VBOX_SIGN_ADDITIONS
    3329 VBoxControl_NOINST  = true

  • trunk/src/VBox/Additions/WINNT/VBoxGINA/Makefile.kmk

    r9518 r9632  
    2525
    2626DLLS += VBoxGINA
    27 ifdef VBOX_WITH_64BIT_ADDITIONS
    2827VBoxGINA_TEMPLATE = VBOXGUESTR3DLL
    29 else
    30 VBoxGINA_TEMPLATE = VBOXW32GUESTR3
    31 endif
    3228VBoxGINA_DEFS     = UNICODE
    3329VBoxGINA_SOURCES  = \
    … …  
    3733        VBoxGINA.def \
    3834        VBoxGINA.rc
    39 ifdef VBOX_WITH_64BIT_ADDITIONS
    4035VBoxGINA_LIBS     = \
    4136        $(VBOX_LIB_IPRT_GUEST_R3)
    42 else
    43 VBoxGINA_LIBS     = \
    44         $(PATH_LIB)/additions/RuntimeW32GuestR3$(VBOXW32GUEST_SUFF_LIB)
    45 endif
    4637
    4738include $(KBUILD_PATH)/subfooter.kmk

  • trunk/src/VBox/Additions/WINNT/VBoxGuest/Makefile.kmk

    r9629 r9632  
    2828#
    2929SYSMODS += VBoxGuest
    30 ifdef VBOX_WITH_64BIT_ADDITIONS
    3130VBoxGuest_TEMPLATE    = VBOXGUESTR0
    32 else
    33 VBoxGuest_TEMPLATE    = VBOXW32GUESTR0
    34 VBoxGuest_SDKS        = W2K3DDKX86 WINPSDKINCS
    35 endif
    3631ifdef VBOX_SIGN_ADDITIONS
    3732 VBoxGuest_NOINST     = true
    … …  
    4035#VBoxGuest_DEFS       += LOG_ENABLED
    4136VBoxGuest_INCS        = ../include
    42 ifdef VBOX_WITH_64BIT_ADDITIONS
    4337VBoxGuest_LDFLAGS.x86   = -Entry:DriverEntry@8
    4438VBoxGuest_LDFLAGS.amd64 = -Entry:DriverEntry
    45 else
    46 VBoxGuest_LDFLAGS     = -Entry:DriverEntry@8
    47 endif
    4839VBoxGuest_SOURCES     = \
    4940        VBoxGuest.cpp \
    … …  
    5142        Helper.cpp \
    5243        VBoxGuest.rc
    53 ifdef VBOX_WITH_64BIT_ADDITIONS
    5444VBoxGuest_LIBS        = \
    5545        $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
    … …  
    5848        $(VBOX_LIB_VBGL_R0BASE) \
    5949        $(VBOX_LIB_IPRT_GUEST_R0)
    60 else
    61 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 endif
    6950
    7051
    … …  
    7253# VBoxGuestNT - NT version of the driver (x86 only).
    7354#
    74 ifdef VBOX_WITH_64BIT_ADDITIONS
    7555SYSMODS.x86 += VBoxGuestNT
    7656ifeq (foo,disabled)
    … …  
    8161VBoxGuestNT_LDFLAGS.x86 = $(VBoxGuest_LDFLAGS.x86)
    8262endif
    83 else
    84 SYSMODS += VBoxGuestNT
    85 VBoxGuestNT_TEMPLATE  = VBOXW32GUESTR0
    86 VBoxGuestNT_SDKS      = W2K3DDKX86 WINPSDKINCS
    87 VBoxGuestNT_INCS      = $(VBoxGuest_INCS)
    88 VBoxGuestNT_LDFLAGS   = $(VBoxGuest_LDFLAGS)
    89 endif
    9063VBoxGuestNT_DEFS      = $(VBoxGuest_DEFS) TARGET_NT4
    9164VBoxGuestNT_SOURCES   = \
    … …  
    9467        NTLegacy.cpp \
    9568        VBoxGuest.rc
    96 ifdef VBOX_WITH_64BIT_ADDITIONS
    9769VBoxGuestNT_LIBS      = \
    9870        $(PATH_SDK_W2K3DDK_LIB)/exsup.lib \
    … …  
    10173        $(VBOX_LIB_VBGL_R0BASE) \
    10274        $(VBOX_LIB_IPRT_GUEST_R0_NT4)
    103 else
    104 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 endif
    11275
    11376#

  • trunk/src/VBox/Additions/WINNT/VBoxHook/Makefile.kmk

    r9519 r9632  
    2828
    2929DLLS += VBoxHook
    30 ifdef VBOX_WITH_64BIT_ADDITIONS
    3130VBoxHook_TEMPLATE = VBOXGUESTR3DLL
    32 else
    33 VBoxHook_TEMPLATE = VBOXW32GUESTR3
    34 endif
    3531VBoxHook_INCS     = ../include
    3632VBoxHook_SOURCES  = \

  • trunk/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk

    r9519 r9632  
    3030PROGRAMS += tstHook
    3131
    32 ifdef VBOX_WITH_64BIT_ADDITIONS
    3332tstHook_TEMPLATE = VBOXGUESTR3EXE
    34 else
    35 tstHook_TEMPLATE = VBOXW32GUESTR3
    36 endif
    3733tstHook_DEFS     = VBOX_HGCM
    3834tstHook_SOURCES  = tstHook.cpp

  • trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

    r9520 r9632  
    2525
    2626PROGRAMS += VBoxTray
    27 ifdef VBOX_WITH_64BIT_ADDITIONS
    2827VBoxTray_TEMPLATE = VBOXGUESTR3EXE
    29 else
    30 VBoxTray_TEMPLATE = VBOXW32GUESTR3
    31 endif
    3228ifdef VBOX_SIGN_ADDITIONS
    3329 VBoxTray_NOINST  = true
    … …  
    4743        VBoxTray.rc
    4844
    49 ifdef VBOX_WITH_64BIT_ADDITIONS
    5045VBoxTray_LIBS     = \
    5146        $(VBOX_LIB_IPRT_GUEST_R3)
    52 else
    53 VBoxTray_LIBS     = \
    54         $(PATH_LIB)/additions/RuntimeW32GuestR3.lib
    55 endif
    5647
    5748# VBoxTray.cpp uses VBOX_SVN_REV.

  • trunk/src/VBox/Additions/WINNT/i8042prt/Makefile.kmk

    r9514 r9632  
    2525
    2626
    27 ifdef VBOX_WITH_64BIT_ADDITIONS
    2827SYSMODS.x86 += VBoxMouseNT
    2928VBoxMouseNT_TEMPLATE    = VBOXGUESTR0
    30 else
    31 SYSMODS += VBoxMouseNT
    32 VBoxMouseNT_TEMPLATE    = VBOXW32GUESTR0
    33 VBoxMouseNT_SDKS        = W2K3DDKX86 WINPSDKINCS
    34 endif
    3529VBoxMouseNT_DEFS        = LOG_TO_BACKDOOR
    3630VBoxMouseNT_INCS        = \
    … …  
    4842        moudep.c \
    4943        i8042prt.rc
    50 ifdef VBOX_WITH_64BIT_ADDITIONS
    5144VBoxMouseNT_LIBS        = \
    5245        $(PATH_SDK_W2K3DDK_LIB)/exsup.lib \
    … …  
    5548        $(VBOX_LIB_VBGL_R0) \
    5649        $(VBOX_LIB_IPRT_GUEST_R0_NT4)
    57 else
    58 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.lib
    66 endif
    6750VBoxMouseNT_DEPS        = \
    6851        $(PATH_VBoxMouseNT)/i8042log.rc

  • trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

    r9500 r9632  
    2727# Target config.
    2828#
    29 ifn1of ($(KBUILD_TARGET)$(VBOX_WITH_64BIT_ADDITIONS), l4 linux win)
    30  LIBRARIES += \
     29LIBRARIES += \
    3130        VBoxGuestR0Lib \
    3231        VBoxGuestR0LibBase
    33  LIBRARIES += \
     32LIBRARIES += \
    3433        VBoxGuestR3Lib \
    3534        VBoxGuestR3LibShared
    36  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
    37   LIBRARIES += \
     35if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
     36 LIBRARIES += \
    3837        VBoxGuestR3LibXFree86
    39  endif
    40 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 a
    42  # separate Linux target for each library so that both platforms
    43  # are built.
    44  ifdef VBOX_WITH_WIN32_ADDITIONS
    45   ifndef VBOX_ADDITIONS_LINUX_ONLY
    46    LIBRARIES += \
    47         VBoxGuestLib \
    48         VBoxGuestLibBase
    49   endif
    50  endif
    51  ifdef VBOX_WITH_LINUX_ADDITIONS
    52    LIBRARIES += \
    53         VBoxGuestR0Lib \
    54         VBoxGuestR0LibBase \
    55         VBoxGuestR3Lib \
    56         VBoxGuestR3LibShared \
    57         VBoxGuestR3LibXFree86
    58  else ifdef VBOX_WITH_X11_ADDITIONS
    59    LIBRARIES += \
    60         VBoxGuestR3Lib \
    61         VBoxGuestR3LibShared \
    62         VBoxGuestR3LibXFree86
    63  endif
    6438endif
    6539
    … …  
    11993        VBoxGuestR3LibTime.cpp \
    12094        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
     95ifeq ($(KBUILD_TARGET),win) ## @todo get rid of this hack.
     96 VBoxGuestR3Lib_SOURCES   = VBoxGuestR3Lib.cpp
    12597endif
     98
    12699
    127100#
    … …  
    154127
    155128
    156 ifndef VBOX_WITH_64BIT_ADDITIONS
    157 
    158 #
    159 # VBoxGuestLib (Windows)
    160 #
    161 VBoxGuestLib_TEMPLATE    = VBOXW32GUESTR0LIB
    162 VBoxGuestLib_SDKS.win    = W2K3DDKX86 WIN32SDK
    163 VBoxGuestLib_SOURCES     = $(VBoxGuestR0Lib_SOURCES)
    164 VBoxGuestLib_INCS        = \
    165         $(PATH_VBoxGuestLib)
    166 VBoxGuestLib_INCS.win    = \
    167         $(PATH_SUB_ROOT)/WINNT/SharedFolders/include
    168 VBoxGuestLib_DEFS = IN_RING0 IN_RT_R0 VBOX_HGCM LOG_TO_BACKDOOR
    169 #VBoxGuestLib_DEFS += LOG_ENABLED
    170 
    171 
    172 #
    173 # VBoxGuestLibBase (Windows)
    174 #
    175 VBoxGuestLibBase_TEMPLATE   = VBOXW32GUESTR0LIB
    176 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_VBOXGUEST
    181 VBoxGuestLibBase_DEFS.win   = $(VBoxGuestLib_DEFS.win)
    182 #VBoxGuestLibBase_DEFS      += LOG_ENABLED
    183 
    184 endif # VBOX_WITH_64BIT_ADDITIONS
    185 
    186129include $(KBUILD_PATH)/subfooter.kmk
    187130

  • trunk/src/VBox/Additions/x11/xclient/Makefile.kmk

    r9553 r9632  
    7272        $(call MSG_L1,Forcing static libstdc++)
    7373        $(QUIET)$(MKDIR) -p $(@D)
    74 ifdef VBOX_WITH_64BIT_ADDITIONS
    7574        $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \
    7675             || $(CP_EXT) -f  `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@
    77 else
    78         $(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 endif
    8176
    8277

  • trunk/src/VBox/Runtime/Makefile.kmk

    r9602 r9632  
    3838 # Only build the additions, sort out the legacy names first.
    3939 #
    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))
    5046  endif
    5147 endif
    … …  
    6460 endif
    6561 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))
    7968   endif
    8069  endif
    … …  
    568557RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
    569558RuntimeGuestR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH)   := $(RuntimeR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH))
    570 ifndef VBOX_WITH_64BIT_ADDITIONS
    571 RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).x86 := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).x86)
    572 RuntimeGuestR3_SOURCES.$(KBUILD_HOST).x86   := $(RuntimeR3_SOURCES.$(KBUILD_HOST).x86)
    573 endif
    574559
    575560
    … …  
    632617# RuntimeW32GuestR3 - Win32 guest program runtime.
    633618#
    634 ifdef VBOX_WITH_64BIT_ADDITIONS
    635   RuntimeW32GuestR3_TEMPLATE     = VBOXGUESTR3LIB
    636 else
    637   RuntimeW32GuestR3_TEMPLATE     = VBOXW32GUESTR3LIB
    638 endif
     619RuntimeW32GuestR3_TEMPLATE     = VBOXGUESTR3LIB
    639620RuntimeW32GuestR3_SDKS         = WINPSDK W2K3DDK
    640621RuntimeW32GuestR3_DEFS         = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX
    … …  
    11911172RuntimeGuestR0_SOURCES                 := $(filter-out generic/RTLogWriteUser-generic.cpp, $(RuntimeR0Drv_SOURCES))
    11921173RuntimeGuestR0_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
     1174RuntimeGuestR0_EXTENDS                 = RuntimeR0Drv
    12091175
    12101176# HACK: no vbi for the solaris guest additions - yet.
    … …  
    12491215RuntimeGuestR0NT4_EXTENDS_BY = appending
    12501216RuntimeGuestR0NT4_DEFS = IPRT_TARGET_NT4
    1251 
    1252 
    1253 ## @todo remove this
    1254 RuntimeOS2GuestR0_TEMPLATE      = VBOXOS2GUESTR0LIB
    1255 RuntimeOS2GuestR0_SOURCES       = \
    1256         $(filter-out common/misc/assert.cpp generic/RTLogWriteUser-generic.cpp,$(RuntimeR0Drv_SOURCES)) \
    1257         $(RuntimeR0Drv_SOURCES.os2) \
    1258         VBox/logbackdoor.cpp
    1259 
    1260 #
    1261 # RuntimeW32GuestR0 - Win32 guest driver runtime.
    1262 #
    1263 ifdef VBOX_WITH_64BIT_ADDITIONS
    1264   RuntimeW32GuestR0_TEMPLATE      = VBOXGUESTR0LIB
    1265 else
    1266   RuntimeW32GuestR0_TEMPLATE      = VBOXW32GUESTR0LIB
    1267 endif
    1268 
    1269 RuntimeW32GuestR0_SDKS          = W2K3DDKX86 WINPSDKINCS
    1270 RuntimeW32GuestR0_INCS         := $(PATH_SUB_CURRENT) include
    1271 RuntimeW32GuestR0_DEFS          = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS IN_SUP_R0
    1272 RuntimeW32GuestR0_DEFS.$(KBUILD_TARGET) =
    1273 RuntimeW32GuestR0_SOURCES       = \
    1274         $(filter-out generic/RTLogWriteUser-generic.cpp,$(RuntimeR0Drv_SOURCES)) \
    1275         $(RuntimeR0Drv_SOURCES.win) \
    1276         VBox/logbackdoor.cpp
    1277 ifdef VBOX_USE_VCC80
    1278 ## @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.asm
    1285 endif
    1286 
    1287 
    1288 #
    1289 # RuntimeW32NT4GuestR0 - Win32 NT4 guest driver runtime.
    1290 #
    1291 RuntimeW32NT4GuestR0_EXTENDS = RuntimeW32GuestR0
    1292 RuntimeW32NT4GuestR0_EXTENDS_BY = appending
    1293 RuntimeW32NT4GuestR0_DEFS = IPRT_TARGET_NT4
    12941217
    12951218
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