Ignore:
Timestamp:
May 8, 2017, 7:03:48 PM (8 years ago)
Author:
bird
Message:

tools: Created VCC120 from VCC100, only difference is the -FS flag for precompiled header related operations.

File:
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/VCC120X86.kmk

    r3024 r3033  
    11# $Id$
    22## @file
    3 # kBuild Tool Config - Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting x86.
    4 #
    5 
    6 #
    7 # Copyright (c) 2004-2016 knut st. osmundsen <bird-kBuild-spam-xiv@anduin.net>
     3# kBuild Tool Config - Visual C++ 12.0 (aka Visual 2013 and MSC v18), targeting x86.
     4#
     5
     6#
     7# Copyright (c) 2004-2017 knut st. osmundsen <bird-kBuild-spam-xiv@anduin.net>
    88#
    99# This file is part of kBuild.
    … …  
    3232#
    3333
    34 TOOL_VCC100X86 := Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting x86.
     34TOOL_VCC120X86 := Visual C++ 12.0 (aka Visual 2013 and MSC v18), targeting x86.
    3535
    3636# Tool Specific Properties
    37 ifndef PATH_TOOL_VCC100X86
    38  PATH_TOOL_VCC100X86 := $(wildcard $(KBUILD_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 $(KBUILD_DEVTOOLS)/x86.win32/vcc/v10*)
    47  endif
    48  ifeq ($(PATH_TOOL_VCC100X86),)
    49   PATH_TOOL_VCC100X86 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/vcc/v10*)
    50  endif
    51  ifneq ($(PATH_TOOL_VCC100X86),)
    52   PATH_TOOL_VCC100X86 := $(lastword $(sort $(PATH_TOOL_VCC100X86)))
     37ifndef PATH_TOOL_VCC120X86
     38 PATH_TOOL_VCC120X86 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/vcc/v12*)
     39 ifeq ($(PATH_TOOL_VCC120X86),)
     40  PATH_TOOL_VCC120X86 := $(PATH_TOOL_VCC120)
     41 endif
     42 ifeq ($(PATH_TOOL_VCC120X86),)
     43  PATH_TOOL_VCC120X86 := $(PATH_TOOL_VCC120AMD64)
     44 endif
     45 ifeq ($(PATH_TOOL_VCC120X86),)
     46  PATH_TOOL_VCC120X86 := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/vcc/v12*)
     47 endif
     48 ifeq ($(PATH_TOOL_VCC120X86),)
     49  PATH_TOOL_VCC120X86 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/vcc/v12*)
     50 endif
     51 ifneq ($(PATH_TOOL_VCC120X86),)
     52  PATH_TOOL_VCC120X86 := $(lastword $(sort $(PATH_TOOL_VCC120X86)))
    5353 else
    54   $(warning kBuild: PATH_TOOL_VCC100X86 cannot be determined!)
    55   PATH_TOOL_VCC100X86 := $(KBUILD_DEVTOOLS)/x86.win/vcc/v10
     54  $(warning kBuild: PATH_TOOL_VCC120X86 cannot be determined!)
     55  PATH_TOOL_VCC120X86 := $(KBUILD_DEVTOOLS)/x86.win/vcc/v12
    5656 endif
    5757else
    5858 # Resolve any fancy stuff once and for all.
    59  PATH_TOOL_VCC100X86 := $(PATH_TOOL_VCC100X86)
     59 PATH_TOOL_VCC120X86 := $(PATH_TOOL_VCC120X86)
    6060endif
    61 PATH_TOOL_VCC100X86_BIN    ?= $(PATH_TOOL_VCC100X86)/bin
    62 PATH_TOOL_VCC100X86_LIB    ?= $(PATH_TOOL_VCC100X86)/lib
    63 PATH_TOOL_VCC100X86_INC    ?= $(PATH_TOOL_VCC100X86)/include
    64 PATH_TOOL_VCC100X86_ATLMFC ?= $(PATH_TOOL_VCC100X86)/atlmfc
    65 PATH_TOOL_VCC100X86_ATLMFC_INC ?= $(PATH_TOOL_VCC100X86_ATLMFC)/include
    66 PATH_TOOL_VCC100X86_ATLMFC_LIB ?= $(PATH_TOOL_VCC100X86_ATLMFC)/lib
    67 TOOL_VCC100X86_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/cl.exe
    68 TOOL_VCC100X86_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/cl.exe
    69 TOOL_VCC100X86_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/ml.exe
    70 #TOOL_VCC100X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/lib.exe - just an exec wrapper for the below
    71 TOOL_VCC100X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/link.exe /LIB
    72 TOOL_VCC100X86_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/link.exe
    73 TOOL_VCC100X86_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/dumpbin.exe
    74 TOOL_VCC100X86_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/editbin.exe
    75 TOOL_VCC100X86_RC  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC100_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC100_RC_CACHED)
    76 TOOL_VCC100X86_MT  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC100_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC100_MT_CACHED)
    77 ifdef TOOL_VCC100X86_USE_KSUBMIT
     61PATH_TOOL_VCC120X86_BIN    ?= $(PATH_TOOL_VCC120X86)/bin
     62PATH_TOOL_VCC120X86_LIB    ?= $(PATH_TOOL_VCC120X86)/lib
     63PATH_TOOL_VCC120X86_INC    ?= $(PATH_TOOL_VCC120X86)/include
     64PATH_TOOL_VCC120X86_ATLMFC ?= $(PATH_TOOL_VCC120X86)/atlmfc
     65PATH_TOOL_VCC120X86_ATLMFC_INC ?= $(PATH_TOOL_VCC120X86_ATLMFC)/include
     66PATH_TOOL_VCC120X86_ATLMFC_LIB ?= $(PATH_TOOL_VCC120X86_ATLMFC)/lib
     67TOOL_VCC120X86_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/cl.exe
     68TOOL_VCC120X86_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/cl.exe
     69TOOL_VCC120X86_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/ml.exe
     70#TOOL_VCC120X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/lib.exe - just an exec wrapper for the below
     71TOOL_VCC120X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/link.exe /LIB
     72TOOL_VCC120X86_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/link.exe
     73TOOL_VCC120X86_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/dumpbin.exe
     74TOOL_VCC120X86_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/editbin.exe
     75TOOL_VCC120X86_RC  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC120_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC120_RC_CACHED)
     76TOOL_VCC120X86_MT  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC120_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC120_MT_CACHED)
     77ifdef TOOL_VCC120X86_USE_KSUBMIT
    7878 ifeq ($(KBUILD_HOST),win)
    79   TOOL_VCC100X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
    80   TOOL_VCC100X86_KSUBMIT_DD = $(TOOL_VCC100X86_KSUBMIT) --
     79  TOOL_VCC120X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
     80  TOOL_VCC120X86_KSUBMIT_DD = $(TOOL_VCC120X86_KSUBMIT) --
    8181 endif
    8282endif
    8383
    84 # The following in duplicated in VCC100.kmk and VCC100X86.kmk.
    85 TOOL_VCC100_FN_FIND_SDK_TOOL_SUB = $(eval $3 := $(firstword  \
     84# The following in duplicated in VCC120.kmk and VCC120X86.kmk.
     85TOOL_VCC120_FN_FIND_SDK_TOOL_SUB = $(eval $3 := $(firstword  \
    8686       $(if-expr defined(PATH_SDK_WINPSDK71_BIN), $(wildcard $(PATH_SDK_WINPSDK71_BIN)/$2)) \
    8787       $(if-expr defined(PATH_SDK_WINPSDK_BIN)  , $(wildcard $(PATH_SDK_WINPSDK_BIN)/$2)) \
    … …  
    8989        $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST_ALT)/sdk/*/[Bb][Ii][Nn]/$2)) \
    9090        $1))
    91 TOOL_VCC100_FN_FIND_SDK_TOOL = $(if-expr !defined($3),$(TOOL_VCC100_FN_FIND_SDK_TOOL_SUB),)$($3)
     91TOOL_VCC120_FN_FIND_SDK_TOOL = $(if-expr !defined($3),$(TOOL_VCC120_FN_FIND_SDK_TOOL_SUB),)$($3)
    9292
    9393## Disabled fast DEP_IDB based dependencies.
    94 #VCC100X86_OLD_DEPS = 1
     94#VCC120X86_OLD_DEPS = 1
    9595
    9696## Constructs the correct .pdb name (the name is lowercased).
    9797# @param    $(1)        Base name, no extention.
    9898# @param    $(2)        The extension.
    99 TOOL_VCC100X86_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
     99TOOL_VCC120X86_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
    100100
    101101
    102102# General Properties used by kBuild
    103 TOOL_VCC100X86_COBJSUFF         ?= .obj
    104 TOOL_VCC100X86_CFLAGS           ?= -TC -nologo -Zi
    105 TOOL_VCC100X86_CFLAGS.debug     ?=
    106 TOOL_VCC100X86_CFLAGS.dbgopt    ?= -O2
    107 TOOL_VCC100X86_CFLAGS.release   ?= -O2
    108 TOOL_VCC100X86_CFLAGS.profile   ?= -O2
    109 TOOL_VCC100X86_CINCS            ?= $(PATH_TOOL_VCC100X86_INC)
    110 TOOL_VCC100X86_CDEFS            ?=
    111 
    112 TOOL_VCC100X86_CXXOBJSUFF       ?= .obj
    113 TOOL_VCC100X86_CXXFLAGS         ?= -TP -nologo -Zi
    114 TOOL_VCC100X86_CXXFLAGS.debug   ?=
    115 TOOL_VCC100X86_CXXFLAGS.dbgopt  ?= -O2
    116 TOOL_VCC100X86_CXXFLAGS.release ?= -O2
    117 TOOL_VCC100X86_CXXFLAGS.profile ?= -O2
    118 TOOL_VCC100X86_CXXINCS          ?= $(PATH_TOOL_VCC100X86_INC) $(PATH_TOOL_VCC100X86_ATLMFC_INC)
    119 TOOL_VCC100X86_CXXDEFS          ?=
    120 
    121 TOOL_VCC100X86_ASOBJSUFF        ?= .obj
    122 
    123 TOOL_VCC100X86_RCOBJSUFF        ?= .res
    124 TOOL_VCC100X86_RCINCS           ?= $(PATH_TOOL_VCC100X86_INC) $(PATH_TOOL_VCC100X86_ATLMFC_INC)
    125 
    126 TOOL_VCC100X86_ARFLAGS          ?= -nologo
    127 TOOL_VCC100X86_ARLIBSUFF        ?= .lib
    128 
    129 TOOL_VCC100X86_LDFLAGS          ?= -nologo -machine:x86
    130 TOOL_VCC100X86_LDFLAGS.debug    ?= -debug
    131 TOOL_VCC100X86_LDFLAGS.dbgopt   ?= -debug
    132 TOOL_VCC100X86_LDFLAGS.profile  ?= -debug
    133 TOOL_VCC100X86_LDFLAGS.release  ?=
     103TOOL_VCC120X86_COBJSUFF         ?= .obj
     104TOOL_VCC120X86_CFLAGS           ?= -TC -nologo -Zi
     105TOOL_VCC120X86_CFLAGS.debug     ?=
     106TOOL_VCC120X86_CFLAGS.dbgopt    ?= -O2
     107TOOL_VCC120X86_CFLAGS.release   ?= -O2
     108TOOL_VCC120X86_CFLAGS.profile   ?= -O2
     109TOOL_VCC120X86_CINCS            ?= $(PATH_TOOL_VCC120X86_INC)
     110TOOL_VCC120X86_CDEFS            ?=
     111
     112TOOL_VCC120X86_CXXOBJSUFF       ?= .obj
     113TOOL_VCC120X86_CXXFLAGS         ?= -TP -nologo -Zi
     114TOOL_VCC120X86_CXXFLAGS.debug   ?=
     115TOOL_VCC120X86_CXXFLAGS.dbgopt  ?= -O2
     116TOOL_VCC120X86_CXXFLAGS.release ?= -O2
     117TOOL_VCC120X86_CXXFLAGS.profile ?= -O2
     118TOOL_VCC120X86_CXXINCS          ?= $(PATH_TOOL_VCC120X86_INC) $(PATH_TOOL_VCC120X86_ATLMFC_INC)
     119TOOL_VCC120X86_CXXDEFS          ?=
     120
     121TOOL_VCC120X86_ASOBJSUFF        ?= .obj
     122
     123TOOL_VCC120X86_RCOBJSUFF        ?= .res
     124TOOL_VCC120X86_RCINCS           ?= $(PATH_TOOL_VCC120X86_INC) $(PATH_TOOL_VCC120X86_ATLMFC_INC)
     125
     126TOOL_VCC120X86_ARFLAGS          ?= -nologo
     127TOOL_VCC120X86_ARLIBSUFF        ?= .lib
     128
     129TOOL_VCC120X86_LDFLAGS          ?= -nologo -machine:x86
     130TOOL_VCC120X86_LDFLAGS.debug    ?= -debug
     131TOOL_VCC120X86_LDFLAGS.dbgopt   ?= -debug
     132TOOL_VCC120X86_LDFLAGS.profile  ?= -debug
     133TOOL_VCC120X86_LDFLAGS.release  ?=
    134134
    135135
    … …  
    148148# @param    $(outbase)  Output basename (full). Use this for list files and such.
    149149# @param    $(objsuff)  Object suffix.
    150 TOOL_VCC100X86_COMPILE_C_DEPEND =
    151 TOOL_VCC100X86_COMPILE_C_DEPORD =
    152 TOOL_VCC100X86_COMPILE_C_OUTPUT =
    153 TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
    154 ifdef TOOL_VCC100X86_KSUBMIT
    155  TOOL_VCC100X86_COMPILE_C_DONT_PURGE_OUTPUT = 1 # speed
    156  define TOOL_VCC100X86_COMPILE_C_CMDS
    157         $(QUIET)$(TOOL_VCC100X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    158                 -- $(TOOL_VCC100X86_CC) -c\
     150TOOL_VCC120X86_COMPILE_C_DEPEND =
     151TOOL_VCC120X86_COMPILE_C_DEPORD =
     152TOOL_VCC120X86_COMPILE_C_OUTPUT =
     153TOOL_VCC120X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC120X86_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC120X86_PDB, $(outbase)-obj,idb)
     154ifdef TOOL_VCC120X86_KSUBMIT
     155 TOOL_VCC120X86_COMPILE_C_DONT_PURGE_OUTPUT = 1 # speed
     156 define TOOL_VCC120X86_COMPILE_C_CMDS
     157        $(QUIET)$(TOOL_VCC120X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
     158                -- $(TOOL_VCC120X86_CC) -c\
    159159                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    160160                -Fd$(outbase)-obj.pdb \
    … …  
    163163 endef
    164164else
    165  define TOOL_VCC100X86_COMPILE_C_CMDS
    166         $(QUIET)$(TOOL_VCC100X86_CC) -c\
     165 define TOOL_VCC120X86_COMPILE_C_CMDS
     166        $(QUIET)$(TOOL_VCC120X86_CC) -c\
    167167                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    168168                -Fd$(outbase)-obj.pdb \
    … …  
    171171        $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
    172172 endef
    173 endif # !TOOL_VCC100X86_KSUBMIT
     173endif # !TOOL_VCC120X86_KSUBMIT
    174174
    175175
    … …  
    187187# @param    $(outbase)  Output basename (full). Use this for list files and such.
    188188# @param    $(objsuff)  Object suffix.
    189 TOOL_VCC100X86_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
    190 TOOL_VCC100X86_COMPILE_CXX_DEPORD =
    191 TOOL_VCC100X86_COMPILE_CXX_OUTPUT =
    192 TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
    193         ,,$(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb))
    194 ifdef TOOL_VCC100X86_KSUBMIT
    195  TOOL_VCC100X86_COMPILE_CXX_DONT_PURGE_OUTPUT = 1 # speed
    196  define TOOL_VCC100X86_COMPILE_CXX_CMDS
    197         $(QUIET)$(TOOL_VCC100X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    198                 -- $(TOOL_VCC100X86_CXX) -c\
     189TOOL_VCC120X86_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
     190TOOL_VCC120X86_COMPILE_CXX_DEPORD =
     191TOOL_VCC120X86_COMPILE_CXX_OUTPUT =
     192TOOL_VCC120X86_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
     193        ,,$(call TOOL_VCC120X86_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC120X86_PDB, $(outbase)-obj,idb))
     194ifdef TOOL_VCC120X86_KSUBMIT
     195 TOOL_VCC120X86_COMPILE_CXX_DONT_PURGE_OUTPUT = 1 # speed
     196 define TOOL_VCC120X86_COMPILE_CXX_CMDS
     197        $(QUIET)$(TOOL_VCC120X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
     198                -- $(TOOL_VCC120X86_CXX) -c\
    199199                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    200200                $(if-expr defined($(target)_PCH_HDR)\
    201                 ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
     201                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE) -FS,)\
    202202                -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_1_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
    203203                -Fo$(obj)\
    … …  
    205205 endef
    206206else
    207  define TOOL_VCC100X86_COMPILE_CXX_CMDS
    208         $(QUIET)$(TOOL_VCC100X86_CXX) -c\
     207 define TOOL_VCC120X86_COMPILE_CXX_CMDS
     208        $(QUIET)$(TOOL_VCC120X86_CXX) -c\
    209209                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    210210                $(if-expr defined($(target)_PCH_HDR)\
    211                 ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
     211                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE) -FS,)\
    212212                -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_1_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
    213213                -Fo$(obj)\
    … …  
    215215        $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
    216216 endef
    217 endif # !TOOL_VCC100X86_KSUBMIT
     217endif # !TOOL_VCC120X86_KSUBMIT
    218218
    219219
    … …  
    224224# related _1_VCC_PCH_FILE and add -Yc.
    225225#
    226 TOOL_VCC100X86-PCH                         := Helper for creating precompiled header using CXX handling.
    227 TOOL_VCC100X86-PCH_EXTENDS                 := VCC100X86
    228 TOOL_VCC100X86-PCH_CXXOBJSUFF              := .obj
    229 TOOL_VCC100X86-PCH_CXXINCS                  = $(TOOL_VCC100X86_CXXINCS)
    230 TOOL_VCC100X86-PCH_CXXFLAGS.debug           = $(TOOL_VCC100X86_CXXFLAGS.debug)
    231 TOOL_VCC100X86-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC100X86_CXXFLAGS.dbgopt)
    232 TOOL_VCC100X86-PCH_CXXFLAGS.release         = $(TOOL_VCC100X86_CXXFLAGS.release)
    233 TOOL_VCC100X86-PCH_CXXFLAGS.profile         = $(TOOL_VCC100X86_CXXFLAGS.profile)
    234 TOOL_VCC100X86-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
    235 TOOL_VCC100X86-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
    236 TOOL_VCC100X86-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
    237 TOOL_VCC100X86-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
    238 ifdef TOOL_VCC100X86_KSUBMIT
    239  define TOOL_VCC100X86-PCH_COMPILE_CXX_CMDS
    240         $(QUIET)$(TOOL_VCC100X86_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
    241                 -- $(TOOL_VCC100X86_CXX) -c -Yc\
     226TOOL_VCC120X86-PCH                         := Helper for creating precompiled header using CXX handling.
     227TOOL_VCC120X86-PCH_EXTENDS                 := VCC120X86
     228TOOL_VCC120X86-PCH_CXXOBJSUFF              := .obj
     229TOOL_VCC120X86-PCH_CXXINCS                  = $(TOOL_VCC120X86_CXXINCS)
     230TOOL_VCC120X86-PCH_CXXFLAGS                 = $(TOOL_VCC120X86_CXXFLAGS) -FS
     231TOOL_VCC120X86-PCH_CXXFLAGS.debug           = $(TOOL_VCC120X86_CXXFLAGS.debug)
     232TOOL_VCC120X86-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC120X86_CXXFLAGS.dbgopt)
     233TOOL_VCC120X86-PCH_CXXFLAGS.release         = $(TOOL_VCC120X86_CXXFLAGS.release)
     234TOOL_VCC120X86-PCH_CXXFLAGS.profile         = $(TOOL_VCC120X86_CXXFLAGS.profile)
     235TOOL_VCC120X86-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
     236TOOL_VCC120X86-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
     237TOOL_VCC120X86-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
     238TOOL_VCC120X86-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
     239ifdef TOOL_VCC120X86_KSUBMIT
     240 define TOOL_VCC120X86-PCH_COMPILE_CXX_CMDS
     241        $(QUIET)$(TOOL_VCC120X86_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
     242                -- $(TOOL_VCC120X86_CXX) -c -Yc\
    242243                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    243244               -Fp$($(target)_1_VCC_PCH_FILE) \
    … …  
    248249 endef
    249250else
    250  define TOOL_VCC100X86-PCH_COMPILE_CXX_CMDS
    251         $(QUIET)$(TOOL_VCC100X86_CXX) -c -Yc\
     251 define TOOL_VCC120X86-PCH_COMPILE_CXX_CMDS
     252        $(QUIET)$(TOOL_VCC120X86_CXX) -c -Yc\
    252253                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    253254               -Fp$($(target)_1_VCC_PCH_FILE) \
    … …  
    259260
    260261 endef
    261 endif # !TOOL_VCC100X86_KSUBMIT
     262endif # !TOOL_VCC120X86_KSUBMIT
    262263
    263264
    … …  
    277278# @param    $(outbase)  Output basename (full). Use this for list files and such.
    278279# @param    $(objsuff)  Object suffix.
    279 TOOL_VCC100X86_COMPILE_RC_DEPEND =
    280 TOOL_VCC100X86_COMPILE_RC_DEPORD =
    281 TOOL_VCC100X86_COMPILE_RC_OUTPUT =
    282 define TOOL_VCC100X86_COMPILE_RC_CMDS
    283         $(QUIET)$(TOOL_VCC100X86_RC) \
     280TOOL_VCC120X86_COMPILE_RC_DEPEND =
     281TOOL_VCC120X86_COMPILE_RC_DEPORD =
     282TOOL_VCC120X86_COMPILE_RC_OUTPUT =
     283define TOOL_VCC120X86_COMPILE_RC_CMDS
     284        $(QUIET)$(TOOL_VCC120X86_RC) \
    284285                $(flags) $(addprefix /i, $(subst /,\\,$(incs))) $(addprefix /d, $(defs))\
    285286                /fo$(obj)\
    … …  
    298299# @param    $(outbase)  Output basename (full). Use this for list files and such.
    299300#
    300 TOOL_VCC100X86_LINK_LIBRARY_DEPEND = $(othersrc)
    301 TOOL_VCC100X86_LINK_LIBRARY_DEPORD =
    302 TOOL_VCC100X86_LINK_LIBRARY_OUTPUT = $(outbase).rsp
    303 TOOL_VCC100X86_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
    304 define TOOL_VCC100X86_LINK_LIBRARY_CMDS
     301TOOL_VCC120X86_LINK_LIBRARY_DEPEND = $(othersrc)
     302TOOL_VCC120X86_LINK_LIBRARY_DEPORD =
     303TOOL_VCC120X86_LINK_LIBRARY_OUTPUT = $(outbase).rsp
     304TOOL_VCC120X86_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
     305define TOOL_VCC120X86_LINK_LIBRARY_CMDS
    305306        $(QUIET)$(APPEND) -tn $(outbase).rsp \
    306307                $(foreach arg,\
    … …  
    309310                        $(addprefix /DEF:,$(filter %.def,$(othersrc))) \
    310311                        ,\"$(arg)\")
    311         $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
     312        $(QUIET)$(TOOL_VCC120X86_KSUBMIT_DD) $(TOOL_VCC120X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
    312313endef
    313314
    … …  
    327328# @param    $(outbase)      Output basename (full). Use this for list files and such.
    328329#
    329 TOOL_VCC100X86_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    330 TOOL_VCC100X86_LINK_PROGRAM_DEPORD =
    331 TOOL_VCC100X86_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp
    332 TOOL_VCC100X86_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
    333 TOOL_VCC100X86_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
    334 TOOL_VCC100X86_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
    335 define TOOL_VCC100X86_LINK_PROGRAM_CMDS
     330TOOL_VCC120X86_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     331TOOL_VCC120X86_LINK_PROGRAM_DEPORD =
     332TOOL_VCC120X86_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp
     333TOOL_VCC120X86_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
     334TOOL_VCC120X86_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
     335TOOL_VCC120X86_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
     336define TOOL_VCC120X86_LINK_PROGRAM_CMDS
    336337        $(QUIET)$(APPEND) -tn $(outbase).rsp \
    337338                $(foreach arg,\
    … …  
    339340                    $(subst /,\\,$(libs)) \
    340341                        ,\"$(arg)\")
    341         $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_LD) $(flags) \
     342        $(QUIET)$(TOOL_VCC120X86_KSUBMIT_DD) $(TOOL_VCC120X86_LD) $(flags) \
    342343                /OUT:$(out) \
    343344                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    … …  
    347348                $(foreach p,$(libpath), /LIBPATH:$(p)) \
    348349                @$(outbase).rsp
    349 ifndef TOOL_VCC100X86_NO_AUTO_MANIFEST
     350ifndef TOOL_VCC120X86_NO_AUTO_MANIFEST
    350351        $(QUIET)$(TEST) -f $(out).manifest -- \
    351                 $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
     352                $(TOOL_VCC120X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
    352353endif
    353354endef
    … …  
    368369#
    369370# @param    $(outbase)  Output basename (full). Use this for list files and such.
    370 TOOL_VCC100X86_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    371 TOOL_VCC100X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
    372 TOOL_VCC100X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).rsp
    373 TOOL_VCC100X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
    374 TOOL_VCC100X86_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib
    375 TOOL_VCC100X86_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
    376 TOOL_VCC100X86_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
    377 define TOOL_VCC100X86_LINK_DLL_CMDS
     371TOOL_VCC120X86_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     372TOOL_VCC120X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
     373TOOL_VCC120X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).rsp
     374TOOL_VCC120X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
     375TOOL_VCC120X86_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib
     376TOOL_VCC120X86_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
     377TOOL_VCC120X86_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
     378define TOOL_VCC120X86_LINK_DLL_CMDS
    378379        $(QUIET)$(APPEND) -tn $(outbase).rsp \
    379380                $(foreach arg,\
    … …  
    381382                    $(subst /,\\,$(libs)) \
    382383                        ,\"$(arg)\")
    383         $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_LD) $(flags) \
     384        $(QUIET)$(TOOL_VCC120X86_KSUBMIT_DD) $(TOOL_VCC120X86_LD) $(flags) \
    384385                /OUT:$(out) \
    385386                /IMPLIB:$(outbase).lib \
    … …  
    391392                $(foreach p,$(libpath), /LIBPATH:$(p)) \
    392393                @$(outbase).rsp
    393 ifndef TOOL_VCC100X86_NO_AUTO_MANIFEST
     394ifndef TOOL_VCC120X86_NO_AUTO_MANIFEST
    394395        $(QUIET)$(TEST) -f $(out).manifest -- \
    395                 $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
     396                $(TOOL_VCC120X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    396397endif
    397398        $(QUIET)$(TEST) -f $(outbase).lib -- $(KLIBTWEAKER_EXT) --clear-timestamps $(outbase).lib
    … …  
    415416#
    416417# @param    $(outbase)  Output basename (full). Use this for list files and such.
    417 TOOL_VCC100X86_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    418 TOOL_VCC100X86_LINK_SYSMOD_DEPORD =
    419 TOOL_VCC100X86_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).rsp
    420 TOOL_VCC100X86_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
    421 TOOL_VCC100X86_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
    422 TOOL_VCC100X86_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
    423 define TOOL_VCC100X86_LINK_SYSMOD_CMDS
     418TOOL_VCC120X86_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     419TOOL_VCC120X86_LINK_SYSMOD_DEPORD =
     420TOOL_VCC120X86_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).rsp
     421TOOL_VCC120X86_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
     422TOOL_VCC120X86_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
     423TOOL_VCC120X86_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
     424define TOOL_VCC120X86_LINK_SYSMOD_CMDS
    424425        $(QUIET)$(APPEND) -tn $(outbase).rsp \
    425426                $(foreach arg,\
    … …  
    427428                    $(subst /,\\,$(libs)) \
    428429                        ,\"$(arg)\")
    429         $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_LD) $(flags) \
     430        $(QUIET)$(TOOL_VCC120X86_KSUBMIT_DD) $(TOOL_VCC120X86_LD) $(flags) \
    430431                /OUT:$(out) \
    431432                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    … …  
    435436                $(foreach p,$(libpath), /LIBPATH:$(p)) \
    436437                @$(outbase).rsp
    437 ifndef TOOL_VCC100X86_NO_AUTO_MANIFEST
     438ifndef TOOL_VCC120X86_NO_AUTO_MANIFEST
    438439        $(QUIET)$(TEST) -f $(out).manifest -- \
    439                 $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
     440                $(TOOL_VCC120X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    440441endif
    441442endef
Note: See TracChangeset for help on using the changeset viewer.