Changeset 2408 for trunk/kBuild


Ignore:
Timestamp:
Jun 16, 2010, 4:13:27 AM (15 years ago)
Author:
bird
Message:

tools/VCC100*.kmk: Visual C++ 2010.

Location:
trunk/kBuild/tools
Files:
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/VCC100.kmk

    r2405 r2408  
    11# $Id$
    22## @file
    3 # kBuild Tool Config - Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting $(KBUILD_TARGET).
    4 #
    5 
    6 #
    7 # Copyright (c) 2004-2009 knut st. osmundsen <bird-kBuild-spamix@anduin.net>
     3# kBuild Tool Config - Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting $(KBUILD_TARGET).
     4#
     5
     6#
     7# Copyright (c) 2004-2010 knut st. osmundsen <bird-kBuild-spamix@anduin.net>
    88#
    99# This file is part of kBuild.
    … …  
    3232#
    3333
    34 TOOL_VCC80 := Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting $(KBUILD_TARGET).
     34TOOL_VCC100 := Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting $(KBUILD_TARGET).
    3535
    3636# Tool Specific Properties
    37 ifndef PATH_TOOL_VCC80
    38  PATH_TOOL_VCC80 := $(wildcard $(PATH_DEVTOOLS_TRG)/vcc/v8*)
    39  ifeq ($(PATH_TOOL_VCC80),)
    40   PATH_TOOL_VCC80 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8*)
    41  endif
    42  ifeq ($(PATH_TOOL_VCC80),)
    43   PATH_TOOL_VCC80 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/vcc/v8*)
    44  endif
    45  ifeq ($(PATH_TOOL_VCC80),)
    46   PATH_TOOL_VCC80 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/vcc/v8*)
    47  endif
    48  ifeq ($(PATH_TOOL_VCC80),)
    49   PATH_TOOL_VCC80 := $(lastword $(sort $(PATH_TOOL_VCC80)))
     37ifndef PATH_TOOL_VCC100
     38 PATH_TOOL_VCC100 := $(wildcard $(PATH_DEVTOOLS_TRG)/vcc/v10*)
     39 ifeq ($(PATH_TOOL_VCC100),)
     40  PATH_TOOL_VCC100 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v10*)
     41 endif
     42 ifeq ($(PATH_TOOL_VCC100),)
     43  PATH_TOOL_VCC100 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/vcc/v10*)
     44 endif
     45 ifeq ($(PATH_TOOL_VCC100),)
     46  PATH_TOOL_VCC100 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/vcc/v10*)
     47 endif
     48 ifeq ($(PATH_TOOL_VCC100),)
     49  PATH_TOOL_VCC100 := $(lastword $(sort $(PATH_TOOL_VCC100)))
    5050 endif
    5151 # if not found, we'll enter 'pathless' mode.
    5252else
    5353 # Resolve any fancy stuff once and for all.
    54  PATH_TOOL_VCC80 := $(PATH_TOOL_VCC80)
     54 PATH_TOOL_VCC100 := $(PATH_TOOL_VCC100)
    5555endif
    56 ifneq ($(PATH_TOOL_VCC80),)
     56ifneq ($(PATH_TOOL_VCC100),)
    5757 ifeq ($(KBUILD_HOST).$(KBUILD_HOST_ARCH),win.amd64)
    58  PATH_TOOL_VCC80_BIN.amd64 ?= $(PATH_TOOL_VCC80)/bin/amd64
     58 PATH_TOOL_VCC100_BIN.amd64 ?= $(PATH_TOOL_VCC100)/bin/amd64
    5959 else
    60  PATH_TOOL_VCC80_BIN.amd64 ?= $(PATH_TOOL_VCC80)/bin/x86_amd64
    61  endif
    62  PATH_TOOL_VCC80_BIN.x86   ?= $(PATH_TOOL_VCC80)/bin
    63  PATH_TOOL_VCC80_BIN       ?= $(PATH_TOOL_VCC80_BIN.$(KBUILD_TARGET_ARCH))
    64  PATH_TOOL_VCC80_LIB.amd64 ?= $(PATH_TOOL_VCC80)/lib/amd64
    65  PATH_TOOL_VCC80_LIB.x86   ?= $(PATH_TOOL_VCC80)/lib
    66  PATH_TOOL_VCC80_LIB       ?= $(PATH_TOOL_VCC80_LIB.$(KBUILD_TARGET_ARCH))
    67  PATH_TOOL_VCC80_INC       ?= $(PATH_TOOL_VCC80)/include
    68  PATH_TOOL_VCC80_ATLMFC    ?= $(PATH_TOOL_VCC80X86)/atlmfc
    69  PATH_TOOL_VCC80_ATLMFC_INC       ?= $(PATH_TOOL_VCC80_ATLMFC)/include
    70  PATH_TOOL_VCC80_ATLMFC_LIB.amd64 ?= $(PATH_TOOL_VCC80_ATLMFC)/lib
    71  PATH_TOOL_VCC80_ATLMFC_LIB.x86   ?= $(PATH_TOOL_VCC80_ATLMFC)/lib/amd64
    72  PATH_TOOL_VCC80_ATLMFC_LIB       ?= $(PATH_TOOL_VCC80_ATLMFC_LIB.$(KBUILD_TARGET_ARCH))
    73  TOOL_VCC80_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/cl.exe
    74  TOOL_VCC80_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/cl.exe
    75  TOOL_VCC80_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/ml64.exe
    76  TOOL_VCC80_RC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN.x86)/rc.exe
    77  TOOL_VCC80_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/lib.exe
    78  TOOL_VCC80_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/link.exe
    79  TOOL_VCC80_MT  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN.x86)/mt.exe
     60 PATH_TOOL_VCC100_BIN.amd64 ?= $(PATH_TOOL_VCC100)/bin/x86_amd64
     61 endif
     62 PATH_TOOL_VCC100_BIN.x86   ?= $(PATH_TOOL_VCC100)/bin
     63 PATH_TOOL_VCC100_BIN       ?= $(PATH_TOOL_VCC100_BIN.$(KBUILD_TARGET_ARCH))
     64 PATH_TOOL_VCC100_LIB.amd64 ?= $(PATH_TOOL_VCC100)/lib/amd64
     65 PATH_TOOL_VCC100_LIB.x86   ?= $(PATH_TOOL_VCC100)/lib
     66 PATH_TOOL_VCC100_LIB       ?= $(PATH_TOOL_VCC100_LIB.$(KBUILD_TARGET_ARCH))
     67 PATH_TOOL_VCC100_INC       ?= $(PATH_TOOL_VCC100)/include
     68 PATH_TOOL_VCC100_ATLMFC    ?= $(PATH_TOOL_VCC100X86)/atlmfc
     69 PATH_TOOL_VCC100_ATLMFC_INC       ?= $(PATH_TOOL_VCC100_ATLMFC)/include
     70 PATH_TOOL_VCC100_ATLMFC_LIB.amd64 ?= $(PATH_TOOL_VCC100_ATLMFC)/lib
     71 PATH_TOOL_VCC100_ATLMFC_LIB.x86   ?= $(PATH_TOOL_VCC100_ATLMFC)/lib/amd64
     72 PATH_TOOL_VCC100_ATLMFC_LIB       ?= $(PATH_TOOL_VCC100_ATLMFC_LIB.$(KBUILD_TARGET_ARCH))
     73 TOOL_VCC100_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100_BIN)/cl.exe
     74 TOOL_VCC100_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100_BIN)/cl.exe
     75 TOOL_VCC100_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100_BIN)/ml64.exe
     76 TOOL_VCC100_RC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100_BIN.x86)/rc.exe
     77 TOOL_VCC100_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100_BIN)/lib.exe
     78 TOOL_VCC100_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100_BIN)/link.exe
     79 TOOL_VCC100_MT  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100_BIN.x86)/mt.exe
    8080else
    8181 # Pathless, relies on the environment.
    82  TOOL_VCC80_CC  ?= $(EXEC_X86_WIN32) cl.exe
    83  TOOL_VCC80_CXX ?= $(EXEC_X86_WIN32) cl.exe
    84  TOOL_VCC80_AS  ?= $(EXEC_X86_WIN32) ml64.exe
    85  TOOL_VCC80_RC  ?= $(EXEC_X86_WIN32) rc.exe
    86  TOOL_VCC80_AR  ?= $(EXEC_X86_WIN32) lib.exe
    87  TOOL_VCC80_LD  ?= $(EXEC_X86_WIN32) link.exe
    88  TOOL_VCC80_MT  ?= $(EXEC_X86_WIN32) mt.exe
     82 TOOL_VCC100_CC  ?= $(EXEC_X86_WIN32) cl.exe
     83 TOOL_VCC100_CXX ?= $(EXEC_X86_WIN32) cl.exe
     84 TOOL_VCC100_AS  ?= $(EXEC_X86_WIN32) ml64.exe
     85 TOOL_VCC100_RC  ?= $(EXEC_X86_WIN32) rc.exe
     86 TOOL_VCC100_AR  ?= $(EXEC_X86_WIN32) lib.exe
     87 TOOL_VCC100_LD  ?= $(EXEC_X86_WIN32) link.exe
     88 TOOL_VCC100_MT  ?= $(EXEC_X86_WIN32) mt.exe
    8989endif
    9090## Disabled fast DEP_IDB based dependencies.
    91 #VCC80_OLD_DEPS = 1
     91#VCC100_OLD_DEPS = 1
    9292
    9393## Constructs the correct .pdb name (the name is lowercased).
    9494# @param    $(1)        Base name, no extention.
    9595# @param    $(2)        The extension.
    96 TOOL_VCC80_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
    97 
    98 TOOL_VCC80_COBJSUFF         ?= .obj
    99 TOOL_VCC80_CFLAGS           ?= -TC -c -nologo
    100 TOOL_VCC80_CFLAGS.debug     ?= -Od -Zi
    101 TOOL_VCC80_CFLAGS.release   ?= -O2
    102 TOOL_VCC80_CFLAGS.profile   ?= -O2
    103 TOOL_VCC80_CINCS            ?= $(PATH_TOOL_VCC80_INC)
    104 TOOL_VCC80_CDEFS            ?=
    105 
    106 TOOL_VCC80_CXXOBJSUFF       ?= .obj
    107 TOOL_VCC80_CXXFLAGS         ?= -TP -c -nologo
    108 TOOL_VCC80_CXXFLAGS.debug   ?= -Od -Zi
    109 TOOL_VCC80_CXXFLAGS.release ?= -O2
    110 TOOL_VCC80_CXXFLAGS.profile ?= -O2
    111 TOOL_VCC80_CXXINCS          ?= $(PATH_TOOL_VCC80_INC) $(PATH_TOOL_VCC80_ATLMFC_INC)
    112 TOOL_VCC80_CXXDEFS          ?=
    113 
    114 TOOL_VCC80_ASOBJSUFF        ?= .obj
    115 
    116 TOOL_VCC80_RCOBJSUFF        ?= .res
    117 TOOL_VCC80_RCINCS           ?= $(PATH_TOOL_VCC80_INC) $(PATH_TOOL_VCC80_ATLMFC_INC)
    118 
    119 TOOL_VCC80_ARFLAGS.amd64    ?= -machine:amd64
    120 TOOL_VCC80_ARFLAGS.x86      ?= -machine:x86
    121 TOOL_VCC80_ARFLAGS          ?= -nologo
    122 TOOL_VCC80_ARLIBSUFF        ?= .lib
    123 
    124 TOOL_VCC80_LDFLAGS.amd64    ?= -machine:amd64
    125 TOOL_VCC80_LDFLAGS.x86      ?= -machine:x86
    126 TOOL_VCC80_LDFLAGS          ?= -nologo
    127 TOOL_VCC80_LDFLAGS.debug    ?= -debug
    128 TOOL_VCC80_LDFLAGS.release  ?=
    129 TOOL_VCC80_LIBPATH.amd64    ?= $(PATH_TOOL_VCC80_LIB.amd64) $(PATH_TOOL_VCC80_ATLMFC_LIB.amd64)
    130 TOOL_VCC80_LIBPATH.x86      ?= $(PATH_TOOL_VCC80_LIB.x86) $(PATH_TOOL_VCC80_ATLMFC_LIB.x86)
     96TOOL_VCC100_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
     97
     98TOOL_VCC100_COBJSUFF         ?= .obj
     99TOOL_VCC100_CFLAGS           ?= -TC -c -nologo
     100TOOL_VCC100_CFLAGS.debug     ?= -Od -Zi
     101TOOL_VCC100_CFLAGS.release   ?= -O2
     102TOOL_VCC100_CFLAGS.profile   ?= -O2
     103TOOL_VCC100_CINCS            ?= $(PATH_TOOL_VCC100_INC)
     104TOOL_VCC100_CDEFS            ?=
     105
     106TOOL_VCC100_CXXOBJSUFF       ?= .obj
     107TOOL_VCC100_CXXFLAGS         ?= -TP -c -nologo
     108TOOL_VCC100_CXXFLAGS.debug   ?= -Od -Zi
     109TOOL_VCC100_CXXFLAGS.release ?= -O2
     110TOOL_VCC100_CXXFLAGS.profile ?= -O2
     111TOOL_VCC100_CXXINCS          ?= $(PATH_TOOL_VCC100_INC) $(PATH_TOOL_VCC100_ATLMFC_INC)
     112TOOL_VCC100_CXXDEFS          ?=
     113
     114TOOL_VCC100_ASOBJSUFF        ?= .obj
     115
     116TOOL_VCC100_RCOBJSUFF        ?= .res
     117TOOL_VCC100_RCINCS           ?= $(PATH_TOOL_VCC100_INC) $(PATH_TOOL_VCC100_ATLMFC_INC)
     118
     119TOOL_VCC100_ARFLAGS.amd64    ?= -machine:amd64
     120TOOL_VCC100_ARFLAGS.x86      ?= -machine:x86
     121TOOL_VCC100_ARFLAGS          ?= -nologo
     122TOOL_VCC100_ARLIBSUFF        ?= .lib
     123
     124TOOL_VCC100_LDFLAGS.amd64    ?= -machine:amd64
     125TOOL_VCC100_LDFLAGS.x86      ?= -machine:x86
     126TOOL_VCC100_LDFLAGS          ?= -nologo
     127TOOL_VCC100_LDFLAGS.debug    ?= -debug
     128TOOL_VCC100_LDFLAGS.release  ?=
     129TOOL_VCC100_LIBPATH.amd64    ?= $(PATH_TOOL_VCC100_LIB.amd64) $(PATH_TOOL_VCC100_ATLMFC_LIB.amd64)
     130TOOL_VCC100_LIBPATH.x86      ?= $(PATH_TOOL_VCC100_LIB.x86) $(PATH_TOOL_VCC100_ATLMFC_LIB.x86)
    131131
    132132
    … …  
    145145# @param    $(outbase)  Output basename (full). Use this for list files and such.
    146146# @param    $(objsuff)  Object suffix.
    147 TOOL_VCC80_COMPILE_C_DEPEND =
    148 TOOL_VCC80_COMPILE_C_DEPORD =
    149 TOOL_VCC80_COMPILE_C_OUTPUT = $(call TOOL_VCC80_PDB, $(outbase)-obj,idb)
    150 TOOL_VCC80_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC80_PDB, $(outbase)-obj,pdb)
    151 define TOOL_VCC80_COMPILE_C_CMDS
    152         $(QUIET)$(TOOL_VCC80_CC) -c\
     147TOOL_VCC100_COMPILE_C_DEPEND =
     148TOOL_VCC100_COMPILE_C_DEPORD =
     149TOOL_VCC100_COMPILE_C_OUTPUT = $(call TOOL_VCC100_PDB, $(outbase)-obj,idb)
     150TOOL_VCC100_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100_PDB, $(outbase)-obj,pdb)
     151define TOOL_VCC100_COMPILE_C_CMDS
     152        $(QUIET)$(TOOL_VCC100_CC) -c\
    153153                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    154154                -Fd$(outbase)-obj.pdb \
    … …  
    156156                -Fo$(obj)\
    157157                $(subst /,\\,$(abspath $(source)))
    158         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC80_PDB,$(outbase)-obj,idb)
     158        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100_PDB,$(outbase)-obj,idb)
    159159endef
    160160
    … …  
    173173# @param    $(outbase)  Output basename (full). Use this for list files and such.
    174174# @param    $(objsuff)  Object suffix.
    175 TOOL_VCC80_COMPILE_CXX_DEPEND =
    176 TOOL_VCC80_COMPILE_CXX_DEPORD =
    177 TOOL_VCC80_COMPILE_CXX_OUTPUT = $(call TOOL_VCC80_PDB, $(outbase)-obj,idb)
    178 TOOL_VCC80_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC80_PDB, $(outbase)-obj,pdb)
    179 define TOOL_VCC80_COMPILE_CXX_CMDS
    180         $(QUIET)$(TOOL_VCC80_CXX) -c\
     175TOOL_VCC100_COMPILE_CXX_DEPEND =
     176TOOL_VCC100_COMPILE_CXX_DEPORD =
     177TOOL_VCC100_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100_PDB, $(outbase)-obj,idb)
     178TOOL_VCC100_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100_PDB, $(outbase)-obj,pdb)
     179define TOOL_VCC100_COMPILE_CXX_CMDS
     180        $(QUIET)$(TOOL_VCC100_CXX) -c\
    181181                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    182182                -Fd$(outbase)-obj.pdb \
    … …  
    184184                -Fo$(obj)\
    185185                $(subst /,\\,$(abspath $(source)))
    186         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC80_PDB,$(outbase)-obj,idb)
     186        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100_PDB,$(outbase)-obj,idb)
    187187endef
    188188
    … …  
    201201# @param    $(outbase)  Output basename (full). Use this for list files and such.
    202202# @param    $(objsuff)  Object suffix.
    203 TOOL_VCC80_COMPILE_RC_OUTPUT =
    204 TOOL_VCC80_COMPILE_RC_DEPEND =
    205 TOOL_VCC80_COMPILE_RC_DEPORD =
    206 define TOOL_VCC80_COMPILE_RC_CMDS
    207         $(QUIET)$(TOOL_VCC80_RC) \
     203TOOL_VCC100_COMPILE_RC_OUTPUT =
     204TOOL_VCC100_COMPILE_RC_DEPEND =
     205TOOL_VCC100_COMPILE_RC_DEPORD =
     206define TOOL_VCC100_COMPILE_RC_CMDS
     207        $(QUIET)$(TOOL_VCC100_RC) \
    208208                $(flags) $(addprefix /i, $(subst /,\\,$(incs))) $(addprefix /d, $(defs))\
    209209                /fo$(obj)\
    … …  
    222222# @param    $(outbase)  Output basename (full). Use this for list files and such.
    223223#
    224 TOOL_VCC80_LINK_LIBRARY_DEPEND = $(othersrc)
    225 TOOL_VCC80_LINK_LIBRARY_DEPORD =
    226 TOOL_VCC80_LINK_LIBRARY_OUTPUT = $(outbase).rsp
    227 TOOL_VCC80_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
    228 define TOOL_VCC80_LINK_LIBRARY_CMDS
     224TOOL_VCC100_LINK_LIBRARY_DEPEND = $(othersrc)
     225TOOL_VCC100_LINK_LIBRARY_DEPORD =
     226TOOL_VCC100_LINK_LIBRARY_OUTPUT = $(outbase).rsp
     227TOOL_VCC100_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
     228define TOOL_VCC100_LINK_LIBRARY_CMDS
    229229        $(QUIET)$(APPEND) -n $(outbase).rsp \
    230230                $(foreach arg,\
    … …  
    233233                        $(addprefix /DEF:,$(filter %.def,$(othersrc))) \
    234234                        ,\"$(arg)\")
    235         $(QUIET)$(TOOL_VCC80_AR) $(flags) /OUT:$(out) @$(outbase).rsp
     235        $(QUIET)$(TOOL_VCC100_AR) $(flags) /OUT:$(out) @$(outbase).rsp
    236236endef
    237237
    … …  
    253253# @param    $(outbase)      Output basename (full). Use this for list files and such.
    254254#
    255 TOOL_VCC80_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    256 TOOL_VCC80_LINK_PROGRAM_DEPORD =
    257 TOOL_VCC80_LINK_PROGRAM_OUTPUT = $(outbase).map
    258 TOOL_VCC80_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
    259 define TOOL_VCC80_LINK_PROGRAM_CMDS
    260         $(QUIET)$(TOOL_VCC80_LD) $(flags) \
     255TOOL_VCC100_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     256TOOL_VCC100_LINK_PROGRAM_DEPORD =
     257TOOL_VCC100_LINK_PROGRAM_OUTPUT = $(outbase).map
     258TOOL_VCC100_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
     259define TOOL_VCC100_LINK_PROGRAM_CMDS
     260        $(QUIET)$(TOOL_VCC100_LD) $(flags) \
    261261                /OUT:$(out) \
    262262                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    … …  
    268268                $(subst /,\\,$(libs))
    269269        $(QUIET)$(TEST) -f $(out).manifest -- \
    270                 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
     270                $(TOOL_VCC100_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
    271271endef
    272272
    … …  
    286286#
    287287# @param    $(outbase)  Output basename (full). Use this for list files and such.
    288 TOOL_VCC80_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    289 TOOL_VCC80_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
    290 TOOL_VCC80_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
    291 TOOL_VCC80_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
    292 define TOOL_VCC80_LINK_DLL_CMDS
    293         $(QUIET)$(TOOL_VCC80_LD) $(flags) \
     288TOOL_VCC100_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     289TOOL_VCC100_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
     290TOOL_VCC100_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
     291TOOL_VCC100_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
     292define TOOL_VCC100_LINK_DLL_CMDS
     293        $(QUIET)$(TOOL_VCC100_LD) $(flags) \
    294294                /OUT:$(out) \
    295295                /IMPLIB:$(outbase).lib \
    … …  
    303303                $(subst /,\\,$(libs))
    304304        $(QUIET)$(TEST) -f $(out).manifest -- \
    305                 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
     305                $(TOOL_VCC100_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    306306        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    307307$(eval _DIRS += $(PATH_LIB))
    … …  
    323323#
    324324# @param    $(outbase)  Output basename (full). Use this for list files and such.
    325 TOOL_VCC80_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    326 TOOL_VCC80_LINK_SYSMOD_DEPORD =
    327 TOOL_VCC80_LINK_SYSMOD_OUTPUT = $(outbase).map
    328 TOOL_VCC80_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
    329 define TOOL_VCC80_LINK_SYSMOD_CMDS
    330         $(QUIET)$(TOOL_VCC80_LD) $(flags) \
     325TOOL_VCC100_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     326TOOL_VCC100_LINK_SYSMOD_DEPORD =
     327TOOL_VCC100_LINK_SYSMOD_OUTPUT = $(outbase).map
     328TOOL_VCC100_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
     329define TOOL_VCC100_LINK_SYSMOD_CMDS
     330        $(QUIET)$(TOOL_VCC100_LD) $(flags) \
    331331                /OUT:$(out) \
    332332                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    … …  
    338338                $(subst /,\\,$(libs))
    339339        $(QUIET)$(TEST) -f $(out).manifest -- \
    340                 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    341 endef
    342 
     340                $(TOOL_VCC100_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
     341endef
     342

  • trunk/kBuild/tools/VCC100AMD64.kmk

    r2405 r2408  
    11# $Id$
    22## @file
    3 # kBuild Tool Config - Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting AMD64.
    4 #
    5 
    6 #
    7 # Copyright (c) 2004-2009 knut st. osmundsen <bird-kBuild-spamix@anduin.net>
     3# kBuild Tool Config - Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting AMD64.
     4#
     5
     6#
     7# Copyright (c) 2004-2010 knut st. osmundsen <bird-kBuild-spamix@anduin.net>
    88#
    99# This file is part of kBuild.
    … …  
    3232#
    3333
    34 TOOL_VCC80AMD64 := Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting AMD64.
     34TOOL_VCC100AMD64 := Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting AMD64
    3535
    3636# Tool Specific Properties
    37 ifndef PATH_TOOL_VCC80AMD64
    38  PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8*)
    39  ifeq ($(PATH_TOOL_VCC80AMD64),)
    40   PATH_TOOL_VCC80AMD64 := $(PATH_TOOL_VCC80)
     37ifndef PATH_TOOL_VCC100AMD64
     38 PATH_TOOL_VCC100AMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v10*)
     39 ifeq ($(PATH_TOOL_VCC100AMD64),)
     40  PATH_TOOL_VCC100AMD64 := $(PATH_TOOL_VCC100)
    4141 endif
    42  ifeq ($(PATH_TOOL_VCC80AMD64),)
    43   PATH_TOOL_VCC80AMD64 := $(PATH_TOOL_VCC80X86)
     42 ifeq ($(PATH_TOOL_VCC100AMD64),)
     43  PATH_TOOL_VCC100AMD64 := $(PATH_TOOL_VCC100X86)
    4444 endif
    45  ifeq ($(PATH_TOOL_VCC80AMD64),)
    46   PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8*)
     45 ifeq ($(PATH_TOOL_VCC100AMD64),)
     46  PATH_TOOL_VCC100AMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v10*)
    4747 endif
    48  ifneq ($(PATH_TOOL_VCC80AMD64),)
    49   PATH_TOOL_VCC80AMD64 := $(lastword $(sort $(PATH_TOOL_VCC80AMD64)))
     48 ifneq ($(PATH_TOOL_VCC100AMD64),)
     49  PATH_TOOL_VCC100AMD64 := $(lastword $(sort $(PATH_TOOL_VCC100AMD64)))
    5050 else
    51   $(warning kBuild: PATH_TOOL_VCC80AMD64 cannot be determined!)
    52   PATH_TOOL_VCC80AMD64 := $(PATH_DEVTOOLS)/win.x86/vcc/v8
     51  $(warning kBuild: PATH_TOOL_VCC100AMD64 cannot be determined!)
     52  PATH_TOOL_VCC100AMD64 := $(PATH_DEVTOOLS)/win.x86/vcc/v10
    5353 endif
    5454else
    5555 # Resolve any fancy stuff once and for all.
    56  PATH_TOOL_VCC80AMD64 := $(PATH_TOOL_VCC80AMD64)
     56 PATH_TOOL_VCC100AMD64 := $(PATH_TOOL_VCC100AMD64)
    5757endif
    5858ifeq ($(KBUILD_HOST).$(KBUILD_HOST_ARCH),win.amd64)
    59 PATH_TOOL_VCC80AMD64_BIN ?= $(PATH_TOOL_VCC80AMD64)/bin/amd64
     59PATH_TOOL_VCC100AMD64_BIN ?= $(PATH_TOOL_VCC100AMD64)/bin/amd64
    6060else
    61 PATH_TOOL_VCC80AMD64_BIN ?= $(PATH_TOOL_VCC80AMD64)/bin/x86_amd64
     61PATH_TOOL_VCC100AMD64_BIN ?= $(PATH_TOOL_VCC100AMD64)/bin/x86_amd64
    6262endif
    63 PATH_TOOL_VCC80AMD64_LIB ?= $(PATH_TOOL_VCC80AMD64)/lib/amd64
    64 PATH_TOOL_VCC80AMD64_INC ?= $(PATH_TOOL_VCC80AMD64)/include
    65 PATH_TOOL_VCC80AMD64_ATLMFC ?= $(PATH_TOOL_VCC80AMD64)/atlmfc
    66 PATH_TOOL_VCC80AMD64_ATLMFC_INC ?= $(PATH_TOOL_VCC80AMD64_ATLMFC)/include
    67 PATH_TOOL_VCC80AMD64_ATLMFC_LIB ?= $(PATH_TOOL_VCC80AMD64_ATLMFC)/lib/amd64
    68 TOOL_VCC80AMD64_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/cl.exe
    69 TOOL_VCC80AMD64_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/cl.exe
    70 TOOL_VCC80AMD64_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/ml64.exe
    71 TOOL_VCC80AMD64_RC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/../rc.exe
    72 TOOL_VCC80AMD64_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/lib.exe
    73 TOOL_VCC80AMD64_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/link.exe
    74 TOOL_VCC80AMD64_MT  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/../mt.exe
     63PATH_TOOL_VCC100AMD64_LIB ?= $(PATH_TOOL_VCC100AMD64)/lib/amd64
     64PATH_TOOL_VCC100AMD64_INC ?= $(PATH_TOOL_VCC100AMD64)/include
     65PATH_TOOL_VCC100AMD64_ATLMFC ?= $(PATH_TOOL_VCC100AMD64)/atlmfc
     66PATH_TOOL_VCC100AMD64_ATLMFC_INC ?= $(PATH_TOOL_VCC100AMD64_ATLMFC)/include
     67PATH_TOOL_VCC100AMD64_ATLMFC_LIB ?= $(PATH_TOOL_VCC100AMD64_ATLMFC)/lib/amd64
     68TOOL_VCC100AMD64_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/cl.exe
     69TOOL_VCC100AMD64_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/cl.exe
     70TOOL_VCC100AMD64_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/ml64.exe
     71TOOL_VCC100AMD64_RC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/../rc.exe
     72TOOL_VCC100AMD64_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/lib.exe
     73TOOL_VCC100AMD64_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/link.exe
     74TOOL_VCC100AMD64_MT  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/../mt.exe
    7575## Disabled fast DEP_IDB based dependencies.
    76 #VCC80AMD64_OLD_DEPS = 1
     76#VCC100AMD64_OLD_DEPS = 1
    7777
    7878## Constructs the correct .pdb name (the name is lowercased).
    7979# @param    $(1)        Base name, no extention.
    8080# @param    $(2)        The extension.
    81 TOOL_VCC80AMD64_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
    82 
    83 TOOL_VCC80AMD64_COBJSUFF         ?= .obj
    84 TOOL_VCC80AMD64_CFLAGS           ?= -TC -c -nologo
    85 TOOL_VCC80AMD64_CFLAGS.debug     ?= -Od -Zi
    86 TOOL_VCC80AMD64_CFLAGS.release   ?= -O2
    87 TOOL_VCC80AMD64_CFLAGS.profile   ?= -O2
    88 TOOL_VCC80AMD64_CINCS            ?= $(PATH_TOOL_VCC80AMD64_INC)
    89 TOOL_VCC80AMD64_CDEFS            ?=
    90 
    91 TOOL_VCC80AMD64_CXXOBJSUFF       ?= .obj
    92 TOOL_VCC80AMD64_CXXFLAGS         ?= -TP -c -nologo
    93 TOOL_VCC80AMD64_CXXFLAGS.debug   ?= -Od -Zi
    94 TOOL_VCC80AMD64_CXXFLAGS.release ?= -O2
    95 TOOL_VCC80AMD64_CXXFLAGS.profile ?= -O2
    96 TOOL_VCC80AMD64_CXXINCS          ?= $(PATH_TOOL_VCC80AMD64_INC) $(PATH_TOOL_VCC80AMD64_ATLMFC_INC)
    97 TOOL_VCC80AMD64_CXXDEFS          ?=
    98 
    99 TOOL_VCC80AMD64_ASOBJSUFF        ?= .obj
    100 
    101 TOOL_VCC80AMD64_RCOBJSUFF        ?= .res
    102 TOOL_VCC80AMD64_RCINCS           ?= $(PATH_TOOL_VCC80AMD64_INC) $(PATH_TOOL_VCC80AMD64_ATLMFC_INC)
    103 
    104 TOOL_VCC80AMD64_ARFLAGS          ?= -nologo -machine:amd64
    105 TOOL_VCC80AMD64_ARLIBSUFF        ?= .lib
    106 
    107 TOOL_VCC80AMD64_LDFLAGS          ?= -nologo -machine:amd64
    108 TOOL_VCC80AMD64_LDFLAGS.debug    ?= -debug
    109 TOOL_VCC80AMD64_LDFLAGS.release  ?=
     81TOOL_VCC100AMD64_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
     82
     83TOOL_VCC100AMD64_COBJSUFF         ?= .obj
     84TOOL_VCC100AMD64_CFLAGS           ?= -TC -c -nologo
     85TOOL_VCC100AMD64_CFLAGS.debug     ?= -Od -Zi
     86TOOL_VCC100AMD64_CFLAGS.release   ?= -O2
     87TOOL_VCC100AMD64_CFLAGS.profile   ?= -O2
     88TOOL_VCC100AMD64_CINCS            ?= $(PATH_TOOL_VCC100AMD64_INC)
     89TOOL_VCC100AMD64_CDEFS            ?=
     90
     91TOOL_VCC100AMD64_CXXOBJSUFF       ?= .obj
     92TOOL_VCC100AMD64_CXXFLAGS         ?= -TP -c -nologo
     93TOOL_VCC100AMD64_CXXFLAGS.debug   ?= -Od -Zi
     94TOOL_VCC100AMD64_CXXFLAGS.release ?= -O2
     95TOOL_VCC100AMD64_CXXFLAGS.profile ?= -O2
     96TOOL_VCC100AMD64_CXXINCS          ?= $(PATH_TOOL_VCC100AMD64_INC) $(PATH_TOOL_VCC100AMD64_ATLMFC_INC)
     97TOOL_VCC100AMD64_CXXDEFS          ?=
     98
     99TOOL_VCC100AMD64_ASOBJSUFF        ?= .obj
     100
     101TOOL_VCC100AMD64_RCOBJSUFF        ?= .res
     102TOOL_VCC100AMD64_RCINCS           ?= $(PATH_TOOL_VCC100AMD64_INC) $(PATH_TOOL_VCC100AMD64_ATLMFC_INC)
     103
     104TOOL_VCC100AMD64_ARFLAGS          ?= -nologo -machine:amd64
     105TOOL_VCC100AMD64_ARLIBSUFF        ?= .lib
     106
     107TOOL_VCC100AMD64_LDFLAGS          ?= -nologo -machine:amd64
     108TOOL_VCC100AMD64_LDFLAGS.debug    ?= -debug
     109TOOL_VCC100AMD64_LDFLAGS.release  ?=
    110110
    111111
    … …  
    124124# @param    $(outbase)  Output basename (full). Use this for list files and such.
    125125# @param    $(objsuff)  Object suffix.
    126 TOOL_VCC80AMD64_COMPILE_C_DEPEND =
    127 TOOL_VCC80AMD64_COMPILE_C_DEPORD =
    128 TOOL_VCC80AMD64_COMPILE_C_OUTPUT = $(call TOOL_VCC80AMD64_PDB, $(outbase)-obj,idb)
    129 TOOL_VCC80AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC80AMD64_PDB, $(outbase)-obj,pdb)
    130 define TOOL_VCC80AMD64_COMPILE_C_CMDS
    131         $(QUIET)$(TOOL_VCC80AMD64_CC) -c\
     126TOOL_VCC100AMD64_COMPILE_C_DEPEND =
     127TOOL_VCC100AMD64_COMPILE_C_DEPORD =
     128TOOL_VCC100AMD64_COMPILE_C_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
     129TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
     130define TOOL_VCC100AMD64_COMPILE_C_CMDS
     131        $(QUIET)$(TOOL_VCC100AMD64_CC) -c\
    132132                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    133133                -Fd$(outbase)-obj.pdb \
    … …  
    135135                -Fo$(obj)\
    136136                $(subst /,\\,$(abspath $(source)))
    137         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC80AMD64_PDB,$(outbase)-obj,idb)
     137        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
    138138endef
    139139
    … …  
    152152# @param    $(outbase)  Output basename (full). Use this for list files and such.
    153153# @param    $(objsuff)  Object suffix.
    154 TOOL_VCC80AMD64_COMPILE_CXX_DEPEND =
    155 TOOL_VCC80AMD64_COMPILE_CXX_DEPORD =
    156 TOOL_VCC80AMD64_COMPILE_CXX_OUTPUT = $(call TOOL_VCC80AMD64_PDB, $(outbase)-obj,idb)
    157 TOOL_VCC80AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC80AMD64_PDB, $(outbase)-obj,pdb)
    158 define TOOL_VCC80AMD64_COMPILE_CXX_CMDS
    159         $(QUIET)$(TOOL_VCC80AMD64_CXX) -c\
     154TOOL_VCC100AMD64_COMPILE_CXX_DEPEND =
     155TOOL_VCC100AMD64_COMPILE_CXX_DEPORD =
     156TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
     157TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
     158define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
     159        $(QUIET)$(TOOL_VCC100AMD64_CXX) -c\
    160160                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    161161                -Fd$(outbase)-obj.pdb \
    … …  
    163163                -Fo$(obj)\
    164164                $(subst /,\\,$(abspath $(source)))
    165         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC80AMD64_PDB,$(outbase)-obj,idb)
     165        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
    166166endef
    167167
    … …  
    180180# @param    $(outbase)  Output basename (full). Use this for list files and such.
    181181# @param    $(objsuff)  Object suffix.
    182 TOOL_VCC80AMD64_COMPILE_RC_DEPEND =
    183 TOOL_VCC80AMD64_COMPILE_RC_DEPORD =
    184 TOOL_VCC80AMD64_COMPILE_RC_OUTPUT =
    185 define TOOL_VCC80AMD64_COMPILE_RC_CMDS
    186         $(QUIET)$(TOOL_VCC80AMD64_RC) \
     182TOOL_VCC100AMD64_COMPILE_RC_DEPEND =
     183TOOL_VCC100AMD64_COMPILE_RC_DEPORD =
     184TOOL_VCC100AMD64_COMPILE_RC_OUTPUT =
     185define TOOL_VCC100AMD64_COMPILE_RC_CMDS
     186        $(QUIET)$(TOOL_VCC100AMD64_RC) \
    187187                $(flags) $(addprefix /i, $(subst /,\\,$(incs))) $(addprefix /d, $(defs))\
    188188                /fo$(obj)\
    … …  
    201201# @param    $(outbase)  Output basename (full). Use this for list files and such.
    202202#
    203 TOOL_VCC80AMD64_LINK_LIBRARY_DEPEND = $(othersrc)
    204 TOOL_VCC80AMD64_LINK_LIBRARY_DEPORD =
    205 TOOL_VCC80AMD64_LINK_LIBRARY_OUTPUT = $(outbase).rsp
    206 TOOL_VCC80AMD64_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
    207 define TOOL_VCC80AMD64_LINK_LIBRARY_CMDS
     203TOOL_VCC100AMD64_LINK_LIBRARY_DEPEND = $(othersrc)
     204TOOL_VCC100AMD64_LINK_LIBRARY_DEPORD =
     205TOOL_VCC100AMD64_LINK_LIBRARY_OUTPUT = $(outbase).rsp
     206TOOL_VCC100AMD64_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
     207define TOOL_VCC100AMD64_LINK_LIBRARY_CMDS
    208208        $(QUIET)$(APPEND) -n $(outbase).rsp \
    209209                $(foreach arg,\
    … …  
    212212                        $(addprefix /DEF:,$(filter %.def,$(othersrc))) \
    213213                        ,\"$(arg)\")
    214         $(QUIET)$(TOOL_VCC80AMD64_AR) $(flags) /OUT:$(out) @$(outbase).rsp
     214        $(QUIET)$(TOOL_VCC100AMD64_AR) $(flags) /OUT:$(out) @$(outbase).rsp
    215215endef
    216216
    … …  
    230230# @param    $(outbase)      Output basename (full). Use this for list files and such.
    231231#
    232 TOOL_VCC80AMD64_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    233 TOOL_VCC80AMD64_LINK_PROGRAM_DEPORD =
    234 TOOL_VCC80AMD64_LINK_PROGRAM_OUTPUT = $(outbase).map
    235 TOOL_VCC80AMD64_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
    236 define TOOL_VCC80AMD64_LINK_PROGRAM_CMDS
    237         $(QUIET)$(TOOL_VCC80AMD64_LD) $(flags) \
     232TOOL_VCC100AMD64_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     233TOOL_VCC100AMD64_LINK_PROGRAM_DEPORD =
     234TOOL_VCC100AMD64_LINK_PROGRAM_OUTPUT = $(outbase).map
     235TOOL_VCC100AMD64_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
     236define TOOL_VCC100AMD64_LINK_PROGRAM_CMDS
     237        $(QUIET)$(TOOL_VCC100AMD64_LD) $(flags) \
    238238                /OUT:$(out) \
    239239                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    … …  
    245245                $(subst /,\\,$(libs))
    246246        $(QUIET)$(TEST) -f $(out).manifest -- \
    247                 $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
     247                $(TOOL_VCC100AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
    248248endef
    249249
    … …  
    263263#
    264264# @param    $(outbase)  Output basename (full). Use this for list files and such.
    265 TOOL_VCC80AMD64_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    266 TOOL_VCC80AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
    267 TOOL_VCC80AMD64_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
    268 TOOL_VCC80AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
    269 define TOOL_VCC80AMD64_LINK_DLL_CMDS
    270         $(QUIET)$(TOOL_VCC80AMD64_LD) $(flags) \
     265TOOL_VCC100AMD64_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     266TOOL_VCC100AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
     267TOOL_VCC100AMD64_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
     268TOOL_VCC100AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
     269define TOOL_VCC100AMD64_LINK_DLL_CMDS
     270        $(QUIET)$(TOOL_VCC100AMD64_LD) $(flags) \
    271271                /OUT:$(out) \
    272272                /IMPLIB:$(outbase).lib \
    … …  
    280280                $(subst /,\\,$(libs))
    281281        $(QUIET)$(TEST) -f $(out).manifest -- \
    282                 $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
     282                $(TOOL_VCC100AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    283283        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    284284$(eval _DIRS += $(PATH_LIB))
    … …  
    300300#
    301301# @param    $(outbase)  Output basename (full). Use this for list files and such.
    302 TOOL_VCC80AMD64_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    303 TOOL_VCC80AMD64_LINK_SYSMOD_DEPORD =
    304 TOOL_VCC80AMD64_LINK_SYSMOD_OUTPUT = $(outbase).map
    305 TOOL_VCC80AMD64_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
    306 define TOOL_VCC80AMD64_LINK_SYSMOD_CMDS
    307         $(QUIET)$(TOOL_VCC80AMD64_LD) $(flags) \
     302TOOL_VCC100AMD64_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     303TOOL_VCC100AMD64_LINK_SYSMOD_DEPORD =
     304TOOL_VCC100AMD64_LINK_SYSMOD_OUTPUT = $(outbase).map
     305TOOL_VCC100AMD64_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
     306define TOOL_VCC100AMD64_LINK_SYSMOD_CMDS
     307        $(QUIET)$(TOOL_VCC100AMD64_LD) $(flags) \
    308308                /OUT:$(out) \
    309309                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    … …  
    315315                $(subst /,\\,$(libs))
    316316        $(QUIET)$(TEST) -f $(out).manifest -- \
    317                 $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    318 endef
    319 
     317                $(TOOL_VCC100AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
     318endef
     319

  • trunk/kBuild/tools/VCC100X86.kmk

    r2405 r2408  
    11# $Id$
    22## @file
    3 # kBuild Tool Config - Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting x86.
    4 #
    5 
    6 #
    7 # Copyright (c) 2004-2009 knut st. osmundsen <bird-kBuild-spamix@anduin.net>
     3# kBuild Tool Config - Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting x86.
     4#
     5
     6#
     7# Copyright (c) 2004-2010 knut st. osmundsen <bird-kBuild-spamix@anduin.net>
    88#
    99# This file is part of kBuild.
    … …  
    3232#
    3333
    34 TOOL_VCC80X86 := Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting x86.
     34TOOL_VCC100X86 := Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting x86.
    3535
    3636# Tool Specific Properties
    37 ifndef PATH_TOOL_VCC80X86
    38  PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8*)
    39  ifeq ($(PATH_TOOL_VCC80X86),)
    40   PATH_TOOL_VCC80X86 := $(PATH_TOOL_VCC80)
    41  endif
    42  ifeq ($(PATH_TOOL_VCC80X86),)
    43   PATH_TOOL_VCC80X86 := $(PATH_TOOL_VCC80AMD64)
    44  endif
    45  ifeq ($(PATH_TOOL_VCC80X86),)
    46   PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/vcc/v8*)
    47  endif
    48  ifeq ($(PATH_TOOL_VCC80X86),)
    49   PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/vcc/v8*)
    50  endif
    51  ifneq ($(PATH_TOOL_VCC80X86),)
    52   PATH_TOOL_VCC80X86 := $(lastword $(sort $(PATH_TOOL_VCC80X86)))
     37ifndef PATH_TOOL_VCC100X86
     38 PATH_TOOL_VCC100X86 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v10*)
     39 ifeq ($(PATH_TOOL_VCC100X86),)
     40  PATH_TOOL_VCC100X86 := $(PATH_TOOL_VCC100)
     41 endif
     42 ifeq ($(PATH_TOOL_VCC100X86),)
     43  PATH_TOOL_VCC100X86 := $(PATH_TOOL_VCC100AMD64)
     44 endif
     45 ifeq ($(PATH_TOOL_VCC100X86),)
     46  PATH_TOOL_VCC100X86 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/vcc/v10*)
     47 endif
     48 ifeq ($(PATH_TOOL_VCC100X86),)
     49  PATH_TOOL_VCC100X86 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/vcc/v10*)
     50 endif
     51 ifneq ($(PATH_TOOL_VCC100X86),)
     52  PATH_TOOL_VCC100X86 := $(lastword $(sort $(PATH_TOOL_VCC100X86)))
    5353 else
    54   $(warning kBuild: PATH_TOOL_VCC80X86 cannot be determined!)
    55   PATH_TOOL_VCC80X86 := $(PATH_DEVTOOLS)/x86.win/vcc/v8
     54  $(warning kBuild: PATH_TOOL_VCC100X86 cannot be determined!)
     55  PATH_TOOL_VCC100X86 := $(PATH_DEVTOOLS)/x86.win/vcc/v10
    5656 endif
    5757else
    5858 # Resolve any fancy stuff once and for all.
    59  PATH_TOOL_VCC80X86 := $(PATH_TOOL_VCC80X86)
     59 PATH_TOOL_VCC100X86 := $(PATH_TOOL_VCC100X86)
    6060endif
    61 PATH_TOOL_VCC80X86_BIN    ?= $(PATH_TOOL_VCC80X86)/bin
    62 PATH_TOOL_VCC80X86_LIB    ?= $(PATH_TOOL_VCC80X86)/lib
    63 PATH_TOOL_VCC80X86_INC    ?= $(PATH_TOOL_VCC80X86)/include
    64 PATH_TOOL_VCC80X86_ATLMFC ?= $(PATH_TOOL_VCC80X86)/atlmfc
    65 PATH_TOOL_VCC80X86_ATLMFC_INC ?= $(PATH_TOOL_VCC80X86_ATLMFC)/include
    66 PATH_TOOL_VCC80X86_ATLMFC_LIB ?= $(PATH_TOOL_VCC80X86_ATLMFC)/lib
    67 TOOL_VCC80X86_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/cl.exe
    68 TOOL_VCC80X86_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/cl.exe
    69 TOOL_VCC80X86_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/ml.exe
    70 TOOL_VCC80X86_RC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/rc.exe
    71 TOOL_VCC80X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/lib.exe
    72 TOOL_VCC80X86_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/link.exe
    73 TOOL_VCC80X86_MT  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/mt.exe
     61PATH_TOOL_VCC100X86_BIN    ?= $(PATH_TOOL_VCC100X86)/bin
     62PATH_TOOL_VCC100X86_LIB    ?= $(PATH_TOOL_VCC100X86)/lib
     63PATH_TOOL_VCC100X86_INC    ?= $(PATH_TOOL_VCC100X86)/include
     64PATH_TOOL_VCC100X86_ATLMFC ?= $(PATH_TOOL_VCC100X86)/atlmfc
     65PATH_TOOL_VCC100X86_ATLMFC_INC ?= $(PATH_TOOL_VCC100X86_ATLMFC)/include
     66PATH_TOOL_VCC100X86_ATLMFC_LIB ?= $(PATH_TOOL_VCC100X86_ATLMFC)/lib
     67TOOL_VCC100X86_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/cl.exe
     68TOOL_VCC100X86_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/cl.exe
     69TOOL_VCC100X86_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/ml.exe
     70TOOL_VCC100X86_RC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/rc.exe
     71TOOL_VCC100X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/lib.exe
     72TOOL_VCC100X86_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/link.exe
     73TOOL_VCC100X86_MT  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/mt.exe
    7474## Disabled fast DEP_IDB based dependencies.
    75 #VCC80X86_OLD_DEPS = 1
     75#VCC100X86_OLD_DEPS = 1
    7676
    7777## Constructs the correct .pdb name (the name is lowercased).
    7878# @param    $(1)        Base name, no extention.
    7979# @param    $(2)        The extension.
    80 TOOL_VCC80X86_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
     80TOOL_VCC100X86_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
    8181
    8282
    8383# General Properties used by kBuild
    84 TOOL_VCC80X86_COBJSUFF         ?= .obj
    85 TOOL_VCC80X86_CFLAGS           ?= -TC -c -nologo
    86 TOOL_VCC80X86_CFLAGS.debug     ?= -Zi
    87 TOOL_VCC80X86_CFLAGS.release   ?= -O2
    88 TOOL_VCC80X86_CFLAGS.profile   ?= -O2
    89 TOOL_VCC80X86_CINCS            ?= $(PATH_TOOL_VCC80X86_INC)
    90 TOOL_VCC80X86_CDEFS            ?=
    91 
    92 TOOL_VCC80X86_CXXOBJSUFF       ?= .obj
    93 TOOL_VCC80X86_CXXFLAGS         ?= -TP -c -nologo
    94 TOOL_VCC80X86_CXXFLAGS.debug   ?= -Zi
    95 TOOL_VCC80X86_CXXFLAGS.release ?= -O2
    96 TOOL_VCC80X86_CXXFLAGS.profile ?= -O2
    97 TOOL_VCC80X86_CXXINCS          ?= $(PATH_TOOL_VCC80X86_INC) $(PATH_TOOL_VCC80X86_ATLMFC_INC)
    98 TOOL_VCC80X86_CXXDEFS          ?=
    99 
    100 TOOL_VCC80X86_ASOBJSUFF        ?= .obj
    101 
    102 TOOL_VCC80X86_RCOBJSUFF        ?= .res
    103 TOOL_VCC80X86_RCINCS           ?= $(PATH_TOOL_VCC80X86_INC) $(PATH_TOOL_VCC80X86_ATLMFC_INC)
    104 
    105 TOOL_VCC80X86_ARFLAGS          ?= -nologo
    106 TOOL_VCC80X86_ARLIBSUFF        ?= .lib
    107 
    108 TOOL_VCC80X86_LDFLAGS          ?= -nologo -machine:x86
    109 TOOL_VCC80X86_LDFLAGS.debug    ?= -debug
    110 TOOL_VCC80X86_LDFLAGS.release  ?=
     84TOOL_VCC100X86_COBJSUFF         ?= .obj
     85TOOL_VCC100X86_CFLAGS           ?= -TC -c -nologo
     86TOOL_VCC100X86_CFLAGS.debug     ?= -Zi
     87TOOL_VCC100X86_CFLAGS.release   ?= -O2
     88TOOL_VCC100X86_CFLAGS.profile   ?= -O2
     89TOOL_VCC100X86_CINCS            ?= $(PATH_TOOL_VCC100X86_INC)
     90TOOL_VCC100X86_CDEFS            ?=
     91
     92TOOL_VCC100X86_CXXOBJSUFF       ?= .obj
     93TOOL_VCC100X86_CXXFLAGS         ?= -TP -c -nologo
     94TOOL_VCC100X86_CXXFLAGS.debug   ?= -Zi
     95TOOL_VCC100X86_CXXFLAGS.release ?= -O2
     96TOOL_VCC100X86_CXXFLAGS.profile ?= -O2
     97TOOL_VCC100X86_CXXINCS          ?= $(PATH_TOOL_VCC100X86_INC) $(PATH_TOOL_VCC100X86_ATLMFC_INC)
     98TOOL_VCC100X86_CXXDEFS          ?=
     99
     100TOOL_VCC100X86_ASOBJSUFF        ?= .obj
     101
     102TOOL_VCC100X86_RCOBJSUFF        ?= .res
     103TOOL_VCC100X86_RCINCS           ?= $(PATH_TOOL_VCC100X86_INC) $(PATH_TOOL_VCC100X86_ATLMFC_INC)
     104
     105TOOL_VCC100X86_ARFLAGS          ?= -nologo
     106TOOL_VCC100X86_ARLIBSUFF        ?= .lib
     107
     108TOOL_VCC100X86_LDFLAGS          ?= -nologo -machine:x86
     109TOOL_VCC100X86_LDFLAGS.debug    ?= -debug
     110TOOL_VCC100X86_LDFLAGS.release  ?=
    111111
    112112
    … …  
    125125# @param    $(outbase)  Output basename (full). Use this for list files and such.
    126126# @param    $(objsuff)  Object suffix.
    127 TOOL_VCC80X86_COMPILE_C_DEPEND =
    128 TOOL_VCC80X86_COMPILE_C_DEPORD =
    129 TOOL_VCC80X86_COMPILE_C_OUTPUT = $(call TOOL_VCC80X86_PDB, $(outbase)-obj,idb)
    130 TOOL_VCC80X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC80X86_PDB, $(outbase)-obj,pdb)
    131 define TOOL_VCC80X86_COMPILE_C_CMDS
    132         $(QUIET)$(TOOL_VCC80X86_CC) -c\
     127TOOL_VCC100X86_COMPILE_C_DEPEND =
     128TOOL_VCC100X86_COMPILE_C_DEPORD =
     129TOOL_VCC100X86_COMPILE_C_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
     130TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
     131define TOOL_VCC100X86_COMPILE_C_CMDS
     132        $(QUIET)$(TOOL_VCC100X86_CC) -c\
    133133                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    134134                -Fd$(outbase)-obj.pdb \
    … …  
    136136                -Fo$(obj)\
    137137                $(subst /,\\,$(abspath $(source)))
    138         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC80X86_PDB,$(outbase)-obj,idb)
     138        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100X86_PDB,$(outbase)-obj,idb)
    139139endef
    140140
    … …  
    153153# @param    $(outbase)  Output basename (full). Use this for list files and such.
    154154# @param    $(objsuff)  Object suffix.
    155 TOOL_VCC80X86_COMPILE_CXX_DEPEND =
    156 TOOL_VCC80X86_COMPILE_CXX_DEPORD =
    157 TOOL_VCC80X86_COMPILE_CXX_OUTPUT = $(call TOOL_VCC80X86_PDB, $(outbase)-obj,idb)
    158 TOOL_VCC80X86_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC80X86_PDB, $(outbase)-obj,pdb)
    159 define TOOL_VCC80X86_COMPILE_CXX_CMDS
    160         $(QUIET)$(TOOL_VCC80X86_CXX) -c\
     155TOOL_VCC100X86_COMPILE_CXX_DEPEND =
     156TOOL_VCC100X86_COMPILE_CXX_DEPORD =
     157TOOL_VCC100X86_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
     158TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
     159define TOOL_VCC100X86_COMPILE_CXX_CMDS
     160        $(QUIET)$(TOOL_VCC100X86_CXX) -c\
    161161                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    162162                -Fd$(outbase)-obj.pdb \
    … …  
    164164                -Fo$(obj)\
    165165                $(subst /,\\,$(abspath $(source)))
    166         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC80X86_PDB,$(outbase)-obj,idb)
     166        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100X86_PDB,$(outbase)-obj,idb)
    167167endef
    168168
    … …  
    182182# @param    $(outbase)  Output basename (full). Use this for list files and such.
    183183# @param    $(objsuff)  Object suffix.
    184 TOOL_VCC80X86_COMPILE_RC_DEPEND =
    185 TOOL_VCC80X86_COMPILE_RC_DEPORD =
    186 TOOL_VCC80X86_COMPILE_RC_OUTPUT =
    187 define TOOL_VCC80X86_COMPILE_RC_CMDS
    188         $(QUIET)$(TOOL_VCC80X86_RC) \
     184TOOL_VCC100X86_COMPILE_RC_DEPEND =
     185TOOL_VCC100X86_COMPILE_RC_DEPORD =
     186TOOL_VCC100X86_COMPILE_RC_OUTPUT =
     187define TOOL_VCC100X86_COMPILE_RC_CMDS
     188        $(QUIET)$(TOOL_VCC100X86_RC) \
    189189                $(flags) $(addprefix /i, $(subst /,\\,$(incs))) $(addprefix /d, $(defs))\
    190190                /fo$(obj)\
    … …  
    203203# @param    $(outbase)  Output basename (full). Use this for list files and such.
    204204#
    205 TOOL_VCC80X86_LINK_LIBRARY_DEPEND = $(othersrc)
    206 TOOL_VCC80X86_LINK_LIBRARY_DEPORD =
    207 TOOL_VCC80X86_LINK_LIBRARY_OUTPUT = $(outbase).rsp
    208 TOOL_VCC80X86_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
    209 define TOOL_VCC80X86_LINK_LIBRARY_CMDS
     205TOOL_VCC100X86_LINK_LIBRARY_DEPEND = $(othersrc)
     206TOOL_VCC100X86_LINK_LIBRARY_DEPORD =
     207TOOL_VCC100X86_LINK_LIBRARY_OUTPUT = $(outbase).rsp
     208TOOL_VCC100X86_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
     209define TOOL_VCC100X86_LINK_LIBRARY_CMDS
    210210        $(QUIET)$(APPEND) -n $(outbase).rsp \
    211211                $(foreach arg,\
    … …  
    214214                        $(addprefix /DEF:,$(filter %.def,$(othersrc))) \
    215215                        ,\"$(arg)\")
    216         $(QUIET)$(TOOL_VCC80X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
     216        $(QUIET)$(TOOL_VCC100X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
    217217endef
    218218
    … …  
    232232# @param    $(outbase)      Output basename (full). Use this for list files and such.
    233233#
    234 TOOL_VCC80X86_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    235 TOOL_VCC80X86_LINK_PROGRAM_DEPORD =
    236 TOOL_VCC80X86_LINK_PROGRAM_OUTPUT = $(outbase).map
    237 TOOL_VCC80X86_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
    238 define TOOL_VCC80X86_LINK_PROGRAM_CMDS
    239         $(QUIET)$(TOOL_VCC80X86_LD) $(flags) \
     234TOOL_VCC100X86_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     235TOOL_VCC100X86_LINK_PROGRAM_DEPORD =
     236TOOL_VCC100X86_LINK_PROGRAM_OUTPUT = $(outbase).map
     237TOOL_VCC100X86_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
     238define TOOL_VCC100X86_LINK_PROGRAM_CMDS
     239        $(QUIET)$(TOOL_VCC100X86_LD) $(flags) \
    240240                /OUT:$(out) \
    241241                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    … …  
    247247                $(subst /,\\,$(libs))
    248248        $(QUIET)$(TEST) -f $(out).manifest -- \
    249                 $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
     249                $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
    250250endef
    251251
    … …  
    265265#
    266266# @param    $(outbase)  Output basename (full). Use this for list files and such.
    267 TOOL_VCC80X86_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    268 TOOL_VCC80X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
    269 TOOL_VCC80X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
    270 TOOL_VCC80X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
    271 define TOOL_VCC80X86_LINK_DLL_CMDS
    272         $(QUIET)$(TOOL_VCC80X86_LD) $(flags) \
     267TOOL_VCC100X86_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     268TOOL_VCC100X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
     269TOOL_VCC100X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
     270TOOL_VCC100X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
     271define TOOL_VCC100X86_LINK_DLL_CMDS
     272        $(QUIET)$(TOOL_VCC100X86_LD) $(flags) \
    273273                /OUT:$(out) \
    274274                /IMPLIB:$(outbase).lib \
    … …  
    282282                $(subst /,\\,$(libs))
    283283        $(QUIET)$(TEST) -f $(out).manifest -- \
    284                 $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
     284                $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    285285        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    286286$(eval _DIRS += $(PATH_LIB))
    … …  
    302302#
    303303# @param    $(outbase)  Output basename (full). Use this for list files and such.
    304 TOOL_VCC80X86_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    305 TOOL_VCC80X86_LINK_SYSMOD_DEPORD =
    306 TOOL_VCC80X86_LINK_SYSMOD_OUTPUT = $(outbase).map
    307 TOOL_VCC80X86_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
    308 define TOOL_VCC80X86_LINK_SYSMOD_CMDS
    309         $(QUIET)$(TOOL_VCC80X86_LD) $(flags) \
     304TOOL_VCC100X86_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     305TOOL_VCC100X86_LINK_SYSMOD_DEPORD =
     306TOOL_VCC100X86_LINK_SYSMOD_OUTPUT = $(outbase).map
     307TOOL_VCC100X86_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
     308define TOOL_VCC100X86_LINK_SYSMOD_CMDS
     309        $(QUIET)$(TOOL_VCC100X86_LD) $(flags) \
    310310                /OUT:$(out) \
    311311                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    … …  
    317317                $(subst /,\\,$(libs))
    318318        $(QUIET)$(TEST) -f $(out).manifest -- \
    319                 $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    320 endef
    321 
     319                $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
     320endef
     321
Note: See TracChangeset for help on using the changeset viewer.