VirtualBox

Changeset 42239 in vbox


Ignore:
Timestamp:
Jul 19, 2012 8:40:31 PM (12 years ago)
Author:
vboxsync
Message:

More Visual C++ 2010 adjustments and hacks.

Location:
trunk
Files:
3 added
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r42220 r42239  
    17941794# VBoxTpG (tracepoint generator)
    17951795VBOX_VBOXTPG    ?= $(PATH_OBJ)/VBoxTpG/VBoxTpG$(HOSTSUFF_EXE)
     1796
     1797# VBoxPeSetVersion (changes the minimum OS version of an image)
     1798VBOX_PE_SET_VERSION ?= $(PATH_OBJ)/VBoxPeSetVersion/VBoxPeSetVersion$(HOSTSUFF_EXE)
    17961799
    17971800# filesplitter (splits java files)
    … …  
    47274730        $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL.win.amd64)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
    47284731        $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib
     4732 TEMPLATE_VBOXGUESTR3EXE_POST_CMDS.win.x86 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out))
     4733 TEMPLATE_VBOXGUESTR3EXE_LNK_DEPS.win.x86  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION))
    47294734else # the gcc guys
    47304735 TEMPLATE_VBOXGUESTR3EXE_EXTENDS  = VBOXR3EXE
    … …  
    47454750endif
    47464751
     4752#
     4753# Template for building normal R3 programs for the guest additions.
     4754#
     4755TEMPLATE_NewVBoxGuestR3Exe = VBox Guest Program w/ IPRT and VBGL.
     4756TEMPLATE_NewVBoxGuestR3Exe_EXTENDS  = VBOXGUESTR3EXE
     4757TEMPLATE_NewVBoxGuestR3Exe_LIBS     = \
     4758        $(VBOX_LIB_IPRT_GUEST_R3) \
     4759        $(VBOX_LIB_VBGL_R3) \
     4760        $(VBOX_LIB_IPRT_GUEST_R3) \
     4761        $(TEMPLATE_VBOXGUESTR3EXE_LIBS)
    47474762
    47484763#
    … …  
    47584773 TEMPLATE_VBOXGUESTR3DLL_LDFLAGS  = $(TEMPLATE_VBOXGUESTR3EXE_LDFLAGS) -fPIC
    47594774endif
     4775
     4776#
     4777# Template for building normal R3 (dynamic) libraries for the guest additions.
     4778#
     4779TEMPLATE_NewVBoxGuestR3Dll = VBox Guest User Dynamic Libraries w/ IPRT and VBGL.
     4780TEMPLATE_NewVBoxGuestR3Dll_EXTENDS  = VBOXGUESTR3DLL
     4781TEMPLATE_NewVBoxGuestR3Dll_LIBS     = \
     4782        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
     4783        $(VBOX_LIB_VBGL_R3_SHARED) \
     4784        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
     4785        $(TEMPLATE_VBOXGUESTR3EXE_LIBS)
    47604786
    47614787#

  • trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/Makefile.kmk

    r41477 r42239  
    2424## @todo kBuild: This needs the WINPSDK fix to work for cross building.
    2525DLLS.x86 += VBoxGuestInstallHelper
    26 VBoxGuestInstallHelper_TEMPLATE = VBOXGUESTR3DLL
     26VBoxGuestInstallHelper_TEMPLATE = NewVBoxGuestR3Dll
    2727ifdef VBOX_SIGN_ADDITIONS # (See the parent makefile.)
    2828 VBoxGuestInstallHelper_INSTTYPE = none

  • trunk/src/VBox/Additions/WINNT/Installer/Loader/Makefile.kmk

    r42154 r42239  
    2323# This has to be 32-bit, so don't include it in the 64-bit build.
    2424PROGRAMS.x86 += VBoxWindowsAdditions
    25 VBoxWindowsAdditions_TEMPLATE= VBOXGUESTR3EXE
     25VBoxWindowsAdditions_TEMPLATE= NewVBoxGuestR3Exe
    2626VBoxWindowsAdditions_DEFS    = _WIN32_WINNT=0x0400 _UNICODE UNICODE
    2727VBoxWindowsAdditions_SOURCES = \

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

    r42154 r42239  
    3131
    3232PROGRAMS += VBoxDrvInst
    33 VBoxDrvInst_TEMPLATE= VBOXGUESTR3EXE
     33VBoxDrvInst_TEMPLATE= NewVBoxGuestR3Exe
    3434VBoxDrvInst_DEFS    = _WIN32_WINNT=0x0400 _UNICODE UNICODE
    3535VBoxDrvInst_DEFS   += VBOX_SVN_REV=$(VBOX_SVN_REV)
    … …  
    4747
    4848PROGRAMS += VBoxGuestDrvInst
    49 VBoxGuestDrvInst_TEMPLATE= VBOXGUESTR3EXE
     49VBoxGuestDrvInst_TEMPLATE= NewVBoxGuestR3Exe
    5050VBoxGuestDrvInst_DEFS    =  _WIN32_WINNT=0x0400 UNICODE
    5151VBoxGuestDrvInst_SOURCES = \
    … …  
    5454
    5555PROGRAMS += RegCleanup
    56 RegCleanup_TEMPLATE = VBOXGUESTR3EXE
     56RegCleanup_TEMPLATE = NewVBoxGuestR3Exe
    5757RegCleanup_DEFS     = _WIN32_WINNT=0x0400 UNICODE
    5858RegCleanup_SOURCES  = \
    … …  
    212212                $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \
    213213                $(VBOX_NSIS_ICON_FILE) \
    214                 $(VBOX_VERSION_STAMP)\
     214                $(VBOX_VERSION_STAMP) \
     215               $$(VBoxDrvInst_1_STAGE_TARGET) \
    215216                | $$(dir $$@)
    216217        $(call MSG_L1,Creating $@, from $<)
    … …  
    250251                $(VBOX_NSIS_ICON_FILE) \
    251252                $(if $(VBOX_SIGNING_MODE),$(PATH_TARGET)/uninst.exe) \
    252                 $(VBOX_VERSION_STAMP)
     253                $(VBOX_VERSION_STAMP) \
     254               $$(VBoxDrvInst_1_STAGE_TARGET)
    253255        $(call MSG_L1,Creating $@, from $<)
    254256        $(QUIET)$(REDIRECT) -C $(VBOX_PATH_WIN_ADD_INS_SRC) \

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

    r41477 r42239  
    11# $Id$
    22## @file
    3 # Sub-Makefile for test cases.
     3# Sub-Makefile for VBoxCredProv test cases.
    44#
    55
    … …  
    2020
    2121PROGRAMS += tstCredentialProvider
    22 tstCredentialProvider_TEMPLATE = VBOXGUESTR3EXE
     22tstCredentialProvider_TEMPLATE = NewVBoxGuestR3Exe
    2323tstCredentialProvider_SOURCES  = \
    2424        tstCredentialProvider.cpp

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

    r41477 r42239  
    11# $Id $
    22## @file
    3 # Sub-Makefile for test cases.
     3# Sub-Makefile for GINA test cases.
    44#
    55
    … …  
    2020
    2121PROGRAMS += tstVBoxGINA
    22 tstVBoxGINA_TEMPLATE = VBOXGUESTR3EXE
     22tstVBoxGINA_TEMPLATE = NewVBoxGuestR3Exe
    2323tstVBoxGINA_SOURCES  = \
    2424        tstVBoxGINA.cpp

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

    r41477 r42239  
    2626PROGRAMS += tstHook
    2727
    28 tstHook_TEMPLATE = VBOXGUESTR3EXE
     28tstHook_TEMPLATE = NewVBoxGuestR3Exe
    2929tstHook_DEFS     = VBOX_WITH_HGCM
    3030tstHook_SOURCES  = tstHook.cpp

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

    r42154 r42239  
    2020
    2121PROGRAMS += VBoxTray
    22 VBoxTray_TEMPLATE = VBOXGUESTR3EXE
     22VBoxTray_TEMPLATE = NewVBoxGuestR3Exe
    2323ifdef VBOX_SIGN_ADDITIONS # (See the parent makefile.)
    2424 VBoxTray_INSTTYPE = none
    … …  
    6464endif
    6565
    66 VBoxTray_LIBS     = \
    67         $(VBOX_LIB_IPRT_GUEST_R3) \
    68         $(VBOX_LIB_VBGL_R3)
    69 
    7066ifdef VBOX_WITH_WDDM
    7167 VBoxTray_DEFS   += VBOX_WITH_WDDM

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

    r41477 r42239  
    2020
    2121PROGRAMS += tstSessionHack
    22 tstSessionHack_TEMPLATE = VBOXGUESTR3EXE
     22tstSessionHack_TEMPLATE = NewVBoxGuestR3Exe
    2323tstSessionHack_DEFS     = VBOX_WITH_HGCM
    2424tstSessionHack_INCS     = ../../include
    … …  
    2626        tstSessionHack.cpp
    2727
    28 tstSessionHack_LIBS     = \
    29         $(VBOX_LIB_VBGL_R3)
    30 
    3128include $(FILE_KBUILD_SUB_FOOTER)
    3229

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

    r41477 r42239  
    2020PROGRAMS += VBoxCertUtil
    2121
    22 VBoxCertUtil_TEMPLATE = VBOXGUESTR3EXE
     22VBoxCertUtil_TEMPLATE = NewVBoxGuestR3Exe
    2323VBoxCertUtil_SOURCES = VBoxCertUtil.cpp
    2424VBoxCertUtil_LIBS = \
    25     $(VBOX_LIB_IPRT_GUEST_R3) \
    26     $(VBOX_LIB_VBGL_R3) \
    2725    crypt32.lib
    2826

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

    r41972 r42239  
    2626#
    2727PROGRAMS += VBoxControl
    28 VBoxControl_TEMPLATE = VBOXGUESTR3EXE
     28VBoxControl_TEMPLATE = NewVBoxGuestR3Exe
    2929ifeq ($(KBUILD_TARGET),win)
    3030 ifdef VBOX_SIGN_ADDITIONS # (See the main Windows Additions makefile.)
    … …  
    4343VBoxControl_SOURCES.win = \
    4444        VBoxControl.rc
    45 VBoxControl_LIBS = \
    46         $(VBOX_LIB_IPRT_GUEST_R3) \
    47         $(VBOX_LIB_VBGL_R3) \
    48         $(VBOX_LIB_IPRT_GUEST_R3)
    4945
    5046include $(FILE_KBUILD_SUB_FOOTER)

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

    r42154 r42239  
    212212#
    213213#PROGRAMS += VBoxGuestInst
    214 VBoxGuestInst_TEMPLATE= VBOXGUESTR3EXE
     214VBoxGuestInst_TEMPLATE= NewVBoxGuestR3Exe
    215215VBoxGuestInst_SOURCES = win/VBoxGuestInst.cpp
    216216endif

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

    r41477 r42239  
    3333# VBoxService
    3434#
    35 VBoxService_TEMPLATE      = VBOXGUESTR3EXE
     35VBoxService_TEMPLATE      = NewVBoxGuestR3Exe
    3636VBoxService_DEFS          = VBOX_WITH_HGCM VBOXSERVICE_TIMESYNC VBOXSERVICE_MANAGEMENT VBOXSERVICE_TOOLBOX
    3737VBoxService_DEFS         += \
    … …  
    113113        VBoxServiceClipboard-os2.cpp
    114114
    115 VBoxService_LIBS          = \
    116         $(VBOX_LIB_IPRT_GUEST_R3) \
    117         $(VBOX_LIB_VBGL_R3) \
    118         $(VBOX_LIB_IPRT_GUEST_R3)
    119115if1of ($(KBUILD_TARGET), linux)
    120116 VBoxService_LIBS        += \
    … …  
    133129# VBoxServiceNT - NT4 version of VBoxService.
    134130#
    135 VBoxServiceNT_TEMPLATE = VBOXGUESTR3EXE
     131VBoxServiceNT_TEMPLATE = NewVBoxGuestR3Exe
    136132VBoxServiceNT_EXTENDS  = VBoxService
    137133VBoxServiceNT_DEFS.win = _WIN32_WINNT=0x0400 TARGET_NT4 VBOXSERVICE_MANAGEMENT

  • trunk/src/VBox/Additions/common/VBoxService/testcase/Makefile.kmk

    r42149 r42239  
    2727# tstUserInfo
    2828#
    29 tstUserInfo_TEMPLATE    = VBOXGUESTR3EXE
     29tstUserInfo_TEMPLATE    = NewVBoxGuestR3Exe
    3030tstUserInfo_SOURCES     = \
    3131        tstUserInfo.cpp
    32 tstUserInfo_LIBS        = \
    33         $(VBOX_LIB_IPRT_GUEST_R3) \
    34         $(VBOX_LIB_VBGL_R3) \
    35         $(VBOX_LIB_IPRT_GUEST_R3)
    3632
    3733include $(FILE_KBUILD_SUB_FOOTER)

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

    r41477 r42239  
    2727# tstPageFusion
    2828#
    29 tstPageFusion_TEMPLATE      = VBOXGUESTR3EXE
     29tstPageFusion_TEMPLATE      = NewVBoxGuestR3Exe
    3030tstPageFusion_DEFS.win     += _WIN32_WINNT=0x0501
    31 
    3231tstPageFusion_SOURCES       = \
    3332        tstPageFusion.cpp
    3433
    35 tstPageFusion_LIBS          = \
    36         $(VBOX_LIB_IPRT_GUEST_R3) \
    37         $(VBOX_LIB_VBGL_R3) \
    38         $(VBOX_LIB_IPRT_GUEST_R3)
    39 
    4034include $(FILE_KBUILD_SUB_FOOTER)
    4135

  • trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk

    r41477 r42239  
    7676#
    7777PROGRAMS += mount.vboxsf
    78 mount.vboxsf_TEMPLATE    = VBOXGUESTR3EXE
     78mount.vboxsf_TEMPLATE    = NewVBoxGuestR3Exe
    7979mount.vboxsf_DEFS        = _GNU_SOURCE
    8080mount.vboxsf_SOURCES     = \

  • trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk

    r41860 r42239  
    9191#
    9292PROGRAMS                += vboxfsmount
    93 vboxfsmount_TEMPLATE    = VBOXGUESTR3EXE
     93vboxfsmount_TEMPLATE    = NewVBoxGuestR3Exe
    9494vboxfsmount_SOURCES     = vboxfs_mount.c
    9595

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

    r41477 r42239  
    2424PROGRAMS += VBoxClient
    2525
    26 VBoxClient_TEMPLATE = VBOXGUESTR3EXE
     26VBoxClient_TEMPLATE = NewVBoxGuestR3Exe
    2727VBoxClient_DEFS += VBOX_X11_CLIPBOARD VBOX_WITH_HGCM
    2828ifdef VBOX_WITH_DBUS
    … …  
    4545        dl
    4646VBoxClient_LIBS = \
    47         $(VBOX_LIB_IPRT_GUEST_R3) \
    48         $(VBOX_LIB_VBGL_R3) \
    49         $(VBOX_LIB_IPRT_GUEST_R3) \
    5047        X11 \
    5148        Xrandr \

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

    r42219 r42239  
    10661066RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).amd64:= $(RuntimeR3_SOURCES.$(KBUILD_TARGET).amd64)
    10671067RuntimeGuestR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH)   := $(RuntimeR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH))
    1068 
     1068ifdef VBOX_USE_VCC100
     1069 RuntimeGuestR3_SOURCES.win.x86              += \
     1070        r3/win/vcc100-kernel32-fakes.cpp \
     1071        r3/win/vcc100-kernel32-fakesA.asm
     1072endif
    10691073
    10701074#

  • trunk/src/bldprogs/Makefile.kmk

    r42048 r42239  
    6161endif
    6262
     63BLDPROGS.win += VBoxPeSetVersion
     64VBoxPeSetVersion_TEMPLATE = VBOXBLDPROG
     65VBoxPeSetVersion_SOURCES  = VBoxPeSetVersion.cpp
     66
    6367include $(FILE_KBUILD_SUB_FOOTER)
    6468
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