Changeset 677 for trunk/kBuild/tools


Ignore:
Timestamp:
Dec 7, 2006, 5:51:39 AM (19 years ago)
Author:
bird
Message:

pathless VCC

Location:
trunk/kBuild/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/VCC70.kmk

    r667 r677  
    2929# Tool Specific Properties
    3030ifndef PATH_TOOL_VCC70
    31  PATH_TOOL_VCC70 := $(wildcard $(PATH_DEVTOOLS)/x86.win/vcc/v7)
     31 PATH_TOOL_VCC70 := $(wildcard $(PATH_DEVTOOLS)/x86.win/vcc/v7 \
     32                                                           $(PATH_DEVTOOLS)/x86.win32/vcc/v7 \
     33                                                           $(PATH_DEVTOOLS)/x86.win32/vcc70)
    3234 ifeq ($(PATH_TOOL_VCC70),)
    33   PATH_TOOL_VCC70 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/vcc/v7)
     35  PATH_TOOL_VCC70 := $(firstword $(PATH_TOOL_VCC70))
    3436 endif
    35  ifeq ($(PATH_TOOL_VCC70),)
    36   PATH_TOOL_VCC70 := $(PATH_DEVTOOLS)/x86.win32/vcc70
    37  endif
    38  ifneq ($(PATH_TOOL_VCC70),)
    39   # done
    40  else
    41   $(warning kBuild: PATH_TOOL_VCC70 cannot be determined!)
    42   PATH_TOOL_VCC70 := $(PATH_DEVTOOLS)/x86.win/vcc/v7
    43  endif
    44 endif
    45 PATH_TOOL_VCC70_BIN ?= $(PATH_TOOL_VCC70)/bin
    46 PATH_TOOL_VCC70_LIB ?= $(PATH_TOOL_VCC70)/lib
    47 PATH_TOOL_VCC70_INC ?= $(PATH_TOOL_VCC70)/include
    48 PATH_TOOL_VCC70_ATLMFC ?= $(PATH_TOOL_VCC70)/atlmfc
    49 PATH_TOOL_VCC70_ATLMFC_INC ?= $(PATH_TOOL_VCC70_ATLMFC)/include
    50 PATH_TOOL_VCC70_ATLMFC_LIB ?= $(PATH_TOOL_VCC70_ATLMFC)/lib
    51 TOOL_VCC70_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/cl.exe
    52 TOOL_VCC70_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/cl.exe
    53 TOOL_VCC70_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/ml.exe
    54 TOOL_VCC70_RC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/rc.exe
    55 TOOL_VCC70_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/lib.exe
    56 TOOL_VCC70_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/link.exe
     37 # if not found, we'll enter 'pathless' mode.
     38else
     39 # Resolve any fancy stuff once and for all.
     40 PATH_TOOL_VCC70 := $(PATH_TOOL_VCC70)
     41endif
     42ifneq ($(PATH_TOOL_VCC70),)
     43 PATH_TOOL_VCC70_BIN ?= $(PATH_TOOL_VCC70)/bin
     44 PATH_TOOL_VCC70_LIB ?= $(PATH_TOOL_VCC70)/lib
     45 PATH_TOOL_VCC70_INC ?= $(PATH_TOOL_VCC70)/include
     46 PATH_TOOL_VCC70_ATLMFC ?= $(PATH_TOOL_VCC70)/atlmfc
     47 PATH_TOOL_VCC70_ATLMFC_INC ?= $(PATH_TOOL_VCC70_ATLMFC)/include
     48 PATH_TOOL_VCC70_ATLMFC_LIB ?= $(PATH_TOOL_VCC70_ATLMFC)/lib
     49 TOOL_VCC70_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/cl.exe
     50 TOOL_VCC70_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/cl.exe
     51 TOOL_VCC70_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/ml.exe
     52 TOOL_VCC70_RC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/rc.exe
     53 TOOL_VCC70_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/lib.exe
     54 TOOL_VCC70_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/link.exe
     55else
     56 # Pathless, relies on the environment.
     57 TOOL_VCC70_CC  ?= $(EXEC_X86_WIN32) cl.exe
     58 TOOL_VCC70_CXX ?= $(EXEC_X86_WIN32) cl.exe
     59 TOOL_VCC70_AS  ?= $(EXEC_X86_WIN32) ml.exe
     60 TOOL_VCC70_RC  ?= $(EXEC_X86_WIN32) rc.exe
     61 TOOL_VCC70_AR  ?= $(EXEC_X86_WIN32) lib.exe
     62 TOOL_VCC70_LD  ?= $(EXEC_X86_WIN32) link.exe
     63endif
    5764VCC70_NEW_DEPS = 1 ##< Enables fast DEP_IDB based dependencies.
    5865

  • trunk/kBuild/tools/VCC80.kmk

    r668 r677  
    2929# Tool Specific Properties
    3030ifndef PATH_TOOL_VCC80
    31  PATH_TOOL_VCC80 := $(wildcard $(PATH_DEVTOOLS_TRG)/vcc/v8)
     31 PATH_TOOL_VCC80 := $(wildcard $(PATH_DEVTOOLS_TRG)/vcc/v8 \
     32                               $(PATH_DEVTOOLS)/x86.win/vcc/v8 \
     33                               $(PATH_DEVTOOLS)/x86.win32/vcc/v8 \
     34                               $(PATH_DEVTOOLS)/amd64.win/vcc/v8)
    3235 ifeq ($(PATH_TOOL_VCC80),)
    33   PATH_TOOL_VCC80 := $(wildcard $(PATH_DEVTOOLS)/x86.win/vcc/v8)
     36  PATH_TOOL_VCC80 := $(firstword $(PATH_TOOL_VCC80))
    3437 endif
    35  ifeq ($(PATH_TOOL_VCC80),)
    36   PATH_TOOL_VCC80 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/vcc/v8)
    37  endif
    38  ifeq ($(PATH_TOOL_VCC80),)
    39   PATH_TOOL_VCC80 := $(wildcard $(PATH_DEVTOOLS)/amd64.win/vcc/v8)
    40  endif
    41  ifneq ($(PATH_TOOL_VCC80),)
    42   # done for now
    43  else
    44   $(warning kBuild: PATH_TOOL_VCC80 cannot be determined!)
    45   PATH_TOOL_VCC80 := $(PATH_DEVTOOLS_TRG)/vcc/v8
    46  endif
     38 # if not found, we'll enter 'pathless' mode.
    4739else
    4840 # Resolve any fancy stuff once and for all.
    4941 PATH_TOOL_VCC80 := $(PATH_TOOL_VCC80)
    5042endif
    51 ifeq ($(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH),win.amd64)
    52 PATH_TOOL_VCC80_BIN.amd64 ?= $(PATH_TOOL_VCC80)/bin/amd64
    53 else
    54 PATH_TOOL_VCC80_BIN.amd64 ?= $(PATH_TOOL_VCC80)/bin/x86_amd64
    55 endif
    56 PATH_TOOL_VCC80_BIN.x86   ?= $(PATH_TOOL_VCC80)/bin
    57 PATH_TOOL_VCC80_BIN       ?= $(PATH_TOOL_VCC80_BIN.$(BUILD_TARGET))
    58 PATH_TOOL_VCC80_LIB.amd64 ?= $(PATH_TOOL_VCC80)/lib/amd64
    59 PATH_TOOL_VCC80_LIB.x86   ?= $(PATH_TOOL_VCC80)/lib
    60 PATH_TOOL_VCC80_LIB       ?= $(PATH_TOOL_VCC80_LIB.$(BUILD_TARGET))
    61 PATH_TOOL_VCC80_INC       ?= $(PATH_TOOL_VCC80)/include
    62 PATH_TOOL_VCC80_ATLMFC    ?= $(PATH_TOOL_VCC80X86)/atlmfc
    63 PATH_TOOL_VCC80_ATLMFC_INC       ?= $(PATH_TOOL_VCC80_ATLMFC)/include
    64 PATH_TOOL_VCC80_ATLMFC_LIB.amd64 ?= $(PATH_TOOL_VCC80_ATLMFC)/lib
    65 PATH_TOOL_VCC80_ATLMFC_LIB.x86   ?= $(PATH_TOOL_VCC80_ATLMFC)/lib/amd64
    66 PATH_TOOL_VCC80_ATLMFC_LIB       ?= $(PATH_TOOL_VCC80_ATLMFC_LIB.$(BUILD_TARGET))
    67 TOOL_VCC80_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/cl.exe
    68 TOOL_VCC80_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/cl.exe
    69 TOOL_VCC80_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/ml64.exe
    70 TOOL_VCC80_RC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/../rc.exe
    71 TOOL_VCC80_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/lib.exe
    72 TOOL_VCC80_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/link.exe
    73 TOOL_VCC80_MT  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/../mt.exe
     43ifneq ($(PATH_TOOL_VCC80),)
     44 ifeq ($(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH),win.amd64)
     45 PATH_TOOL_VCC80_BIN.amd64 ?= $(PATH_TOOL_VCC80)/bin/amd64
     46 else
     47 PATH_TOOL_VCC80_BIN.amd64 ?= $(PATH_TOOL_VCC80)/bin/x86_amd64
     48 endif
     49 PATH_TOOL_VCC80_BIN.x86   ?= $(PATH_TOOL_VCC80)/bin
     50 PATH_TOOL_VCC80_BIN       ?= $(PATH_TOOL_VCC80_BIN.$(BUILD_TARGET))
     51 PATH_TOOL_VCC80_LIB.amd64 ?= $(PATH_TOOL_VCC80)/lib/amd64
     52 PATH_TOOL_VCC80_LIB.x86   ?= $(PATH_TOOL_VCC80)/lib
     53 PATH_TOOL_VCC80_LIB       ?= $(PATH_TOOL_VCC80_LIB.$(BUILD_TARGET))
     54 PATH_TOOL_VCC80_INC       ?= $(PATH_TOOL_VCC80)/include
     55 PATH_TOOL_VCC80_ATLMFC    ?= $(PATH_TOOL_VCC80X86)/atlmfc
     56 PATH_TOOL_VCC80_ATLMFC_INC       ?= $(PATH_TOOL_VCC80_ATLMFC)/include
     57 PATH_TOOL_VCC80_ATLMFC_LIB.amd64 ?= $(PATH_TOOL_VCC80_ATLMFC)/lib
     58 PATH_TOOL_VCC80_ATLMFC_LIB.x86   ?= $(PATH_TOOL_VCC80_ATLMFC)/lib/amd64
     59 PATH_TOOL_VCC80_ATLMFC_LIB       ?= $(PATH_TOOL_VCC80_ATLMFC_LIB.$(BUILD_TARGET))
     60 TOOL_VCC80_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/cl.exe
     61 TOOL_VCC80_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/cl.exe
     62 TOOL_VCC80_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/ml64.exe
     63 TOOL_VCC80_RC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN.x86)/rc.exe
     64 TOOL_VCC80_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/lib.exe
     65 TOOL_VCC80_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/link.exe
     66 TOOL_VCC80_MT  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN.x86)/mt.exe
     67else
     68 # Pathless, relies on the environment.
     69 TOOL_VCC80_CC  ?= $(EXEC_X86_WIN32) cl.exe
     70 TOOL_VCC80_CXX ?= $(EXEC_X86_WIN32) cl.exe
     71 TOOL_VCC80_AS  ?= $(EXEC_X86_WIN32) ml64.exe
     72 TOOL_VCC80_RC  ?= $(EXEC_X86_WIN32) rc.exe
     73 TOOL_VCC80_AR  ?= $(EXEC_X86_WIN32) lib.exe
     74 TOOL_VCC80_LD  ?= $(EXEC_X86_WIN32) link.exe
     75 TOOL_VCC80_MT  ?= $(EXEC_X86_WIN32) mt.exe
     76endif
    7477VCC80_NEW_DEPS = 1 ##< Enables fast DEP_IDB based dependencies.
    7578
    … …  
    114117TOOL_VCC80_LDFLAGS.debug    ?= -debug
    115118TOOL_VCC80_LDFLAGS.release  ?=
     119TOOL_VCC80_LIBPATH.amd64    ?= $(PATH_TOOL_VCC80_LIB.amd64) $(PATH_TOOL_VCC80_ATLMFC_LIB.amd64)
     120TOOL_VCC80_LIBPATH.x86      ?= $(PATH_TOOL_VCC80_LIB.x86) $(PATH_TOOL_VCC80_ATLMFC_LIB.x86)
    116121
    117122
Note: See TracChangeset for help on using the changeset viewer.