VirtualBox

Changeset 42239 in vbox for trunk/src/VBox/Additions/WINNT


Ignore:
Timestamp:
Jul 19, 2012 8:40:31 PM (13 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
79283
Message:

More Visual C++ 2010 adjustments and hacks.

Location:
trunk/src/VBox/Additions/WINNT
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette