Changeset 437 for trunk/kBuild/tools


Ignore:
Timestamp:
May 27, 2006, 2:45:08 PM (19 years ago)
Author:
bird
Message:

More or less ok now..

Location:
trunk/kBuild/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/VCC80AMD64.kmk

    r434 r437  
    2929PATH_TOOL_VCC80AMD64               ?= $(PATH_DEV)/x86.win32/vcc80
    3030PATH_TOOL_VCC80AMD64_LIB           ?= $(PATH_DEV)/x86.win32/vcc80/lib
    31 ifeq ($(BUILD_PLATFORM),win64
    32 PATH_TOOL_VCC80AMD64_BIN           ?= $(PATH_DEV)/x86.win32/vcc80/amd64/bin
     31ifeq ($(BUILD_PLATFORM),win64)
     32PATH_TOOL_VCC80AMD64_BIN           ?= $(PATH_DEV)/x86.win32/vcc80/bin/amd64
    3333else
    34 PATH_TOOL_VCC80AMD64_BIN           ?= $(PATH_DEV)/x86.win32/vcc80/x86_amd64/bin
    35 endif
    36 
    37 TOOL_VCC80AMD64_CC                 := $(EXEC_AMD64_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/cl.exe
     34PATH_TOOL_VCC80AMD64_BIN           ?= $(PATH_DEV)/x86.win32/vcc80/bin/x86_amd64
     35endif
     36
     37TOOL_VCC80AMD64_CC                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/cl.exe
    3838TOOL_VCC80AMD64_COBJSUFF           := .obj
    3939TOOL_VCC80AMD64_CFLAGS             := -TC -c -nologo
    … …  
    4444TOOL_VCC80AMD64_CDEFS              :=
    4545
    46 TOOL_VCC80AMD64_CXX                := $(EXEC_AMD64_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/cl.exe
     46TOOL_VCC80AMD64_CXX                := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/cl.exe
    4747TOOL_VCC80AMD64_CXXOBJSUFF         := .obj
    4848TOOL_VCC80AMD64_CXXFLAGS           := -TP -c -nologo
    … …  
    5353TOOL_VCC80AMD64_CXXDEFS            :=
    5454
    55 TOOL_VCC80AMD64_AS                 := $(EXEC_AMD64_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/ml.exe
     55TOOL_VCC80AMD64_AS                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/ml.exe
    5656TOOL_VCC80AMD64_ASOBJSUFF          := .obj
    5757
    58 TOOL_VCC80AMD64_AR                 := $(EXEC_AMD64_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/lib.exe
     58TOOL_VCC80AMD64_AR                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/lib.exe
    5959TOOL_VCC80AMD64_ARFLAGS            := -nologo
    6060TOOL_VCC80AMD64_ARLIBSUFF          := .lib
    6161
    62 TOOL_VCC80AMD64_LD                 := $(EXEC_AMD64_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/link.exe
    63 TOOL_VCC80AMD64_LDFLAGS            := -nologo
     62TOOL_VCC80AMD64_LD                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/link.exe
     63TOOL_VCC80AMD64_LDFLAGS            := -nologo -machine:amd64
    6464TOOL_VCC80AMD64_LDFLAGS.debug      := -debug
    6565TOOL_VCC80AMD64_LDFLAGS.release    :=
     66
     67TOOL_VCC80AMD64_MT                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/mt.exe
     68
    6669
    6770## Constructs the correct .pdb name (the name is lowercased).
    … …  
    195198# @param    $(outbase)      Output basename (full). Use this for list files and such.
    196199#
    197 TOOL_VCC80AMD64_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80AMD64_PDB, $(outbase),pdb) $(outbase).ilk
     200TOOL_VCC80AMD64_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80AMD64_PDB, $(outbase),pdb) $(outbase).ilk $(out).manifest
    198201TOOL_VCC80AMD64_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    199202TOOL_VCC80AMD64_LINK_PROGRAM_DEPORD =
    … …  
    201204        $(TOOL_VCC80AMD64_LD) $(flags) \
    202205                /OUT:$(out) \
    203                 /MAPINFO:EXPORTS /INCREMENTAL:NO /MAPINFO:LINES \
     206                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    204207                /MAP:$(outbase).map \
    205208                $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def)) \
    … …  
    208211                $(subst /,\\,$(objs)) \
    209212                $(subst /,\\,$(libs))
     213        if test -f $(out).manifest; then \
     214                $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)); \
     215        fi
    210216endef
    211217
    … …  
    225231#
    226232# @param    $(outbase)  Output basename (full). Use this for list files and such.
    227 TOOL_VCC80AMD64_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80AMD64_PDB, $(outbase),pdb) $(outbase).ilk
     233TOOL_VCC80AMD64_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80AMD64_PDB, $(outbase),pdb) $(outbase).ilk $(out).manifest
    228234TOOL_VCC80AMD64_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    229235TOOL_VCC80AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
    … …  
    232238                /OUT:$(out) \
    233239                /IMPLIB:$(outbase).lib \
    234                 /MAPINFO:EXPORTS /INCREMENTAL:NO /MAPINFO:LINES \
     240                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    235241                /MAP:$(outbase).map \
    236242                /DLL \
    … …  
    240246                $(subst /,\\,$(objs)) \
    241247                $(subst /,\\,$(libs))
     248        if test -f $(out).manifest; then \
     249                $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \
     250        fi
    242251ifeq ($(filter %.exp .def,$(othersrc)),)
    243252        if test -f $(outbase).exp; then $(CP_EXT) $(outbase).exp $(PATH_LIB)/; fi
    … …  
    262271#
    263272# @param    $(outbase)  Output basename (full). Use this for list files and such.
    264 TOOL_VCC80AMD64_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80AMD64_PDB, $(outbase),pdb) $(outbase).ilk
     273TOOL_VCC80AMD64_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80AMD64_PDB, $(outbase),pdb) $(outbase).ilk $(out).manifest
    265274TOOL_VCC80AMD64_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    266275TOOL_VCC80AMD64_LINK_SYSMOD_DEPORD =
    … …  
    268277        $(TOOL_VCC80AMD64_LD) $(flags) \
    269278                /OUT:$(out) \
    270                 /MAPINFO:EXPORTS /INCREMENTAL:NO /MAPINFO:LINES \
     279                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    271280                /MAP:$(outbase).map \
    272281                $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def)) \
    … …  
    275284                $(subst /,\\,$(objs)) \
    276285                $(subst /,\\,$(libs))
    277 endef
    278 
     286        if test -f $(out).manifest; then \
     287                $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \
     288        fi
     289endef
     290

  • trunk/kBuild/tools/VCC80X86.kmk

    r434 r437  
    3434TOOL_VCC80X86_COBJSUFF           := .obj
    3535TOOL_VCC80X86_CFLAGS             := -TC -c -nologo
    36 TOOL_VCC80X86_CFLAGS.debug       := -Od -Zi
     36TOOL_VCC80X86_CFLAGS.debug       := -Zi
    3737TOOL_VCC80X86_CFLAGS.release     := -O2
    3838TOOL_VCC80X86_CFLAGS.profile     := -O2
    … …  
    4343TOOL_VCC80X86_CXXOBJSUFF         := .obj
    4444TOOL_VCC80X86_CXXFLAGS           := -TP -c -nologo
    45 TOOL_VCC80X86_CXXFLAGS.debug     := -Od -Zi
     45TOOL_VCC80X86_CXXFLAGS.debug     := -Zi
    4646TOOL_VCC80X86_CXXFLAGS.release   := -O2
    4747TOOL_VCC80X86_CXXFLAGS.profile   := -O2
    … …  
    5757
    5858TOOL_VCC80X86_LD                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/link.exe
    59 TOOL_VCC80X86_LDFLAGS            := -nologo
     59TOOL_VCC80X86_LDFLAGS            := -nologo -machine:x86
    6060TOOL_VCC80X86_LDFLAGS.debug      := -debug
    6161TOOL_VCC80X86_LDFLAGS.release    :=
     62
     63TOOL_VCC80X86_MT                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/mt.exe
    6264
    6365## Constructs the correct .pdb name (the name is lowercased).
    … …  
    6971TOOL_VCC80X86_PDB                = $(1).$(2)
    7072endif
     73
    7174
    7275#ifeq ($(BUILD_PLATFORM),win32)
    … …  
    191194# @param    $(outbase)      Output basename (full). Use this for list files and such.
    192195#
    193 TOOL_VCC80X86_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80X86_PDB, $(outbase),pdb) $(outbase).ilk
     196TOOL_VCC80X86_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80X86_PDB, $(outbase),pdb) $(outbase).ilk $(out).manifest
    194197TOOL_VCC80X86_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    195198TOOL_VCC80X86_LINK_PROGRAM_DEPORD =
    … …  
    197200        $(TOOL_VCC80X86_LD) $(flags) \
    198201                /OUT:$(out) \
    199                 /MAPINFO:EXPORTS /INCREMENTAL:NO /MAPINFO:LINES \
     202                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    200203                /MAP:$(outbase).map \
    201204                $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def)) \
    … …  
    204207                $(subst /,\\,$(objs)) \
    205208                $(subst /,\\,$(libs))
     209        if test -f $(out).manifest; then \
     210                $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)); \
     211        fi
    206212endef
    207213
    … …  
    221227#
    222228# @param    $(outbase)  Output basename (full). Use this for list files and such.
    223 TOOL_VCC80X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80X86_PDB, $(outbase),pdb) $(outbase).ilk
     229TOOL_VCC80X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80X86_PDB, $(outbase),pdb) $(outbase).ilk $(out).manifest
    224230TOOL_VCC80X86_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    225231TOOL_VCC80X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
    … …  
    228234                /OUT:$(out) \
    229235                /IMPLIB:$(outbase).lib \
    230                 /MAPINFO:EXPORTS /INCREMENTAL:NO /MAPINFO:LINES \
     236                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    231237                /MAP:$(outbase).map \
    232238                /DLL \
    … …  
    236242                $(subst /,\\,$(objs)) \
    237243                $(subst /,\\,$(libs))
     244        if test -f $(out).manifest; then \
     245                $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \
     246        fi
    238247ifeq ($(filter %.exp .def,$(othersrc)),)
    239248        if test -f $(outbase).exp; then $(CP_EXT) $(outbase).exp $(PATH_LIB)/; fi
    … …  
    258267#
    259268# @param    $(outbase)  Output basename (full). Use this for list files and such.
    260 TOOL_VCC80X86_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80X86_PDB, $(outbase),pdb) $(outbase).ilk
     269TOOL_VCC80X86_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80X86_PDB, $(outbase),pdb) $(outbase).ilk $(out).manifest
    261270TOOL_VCC80X86_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    262271TOOL_VCC80X86_LINK_SYSMOD_DEPORD =
    … …  
    264273        $(TOOL_VCC80X86_LD) $(flags) \
    265274                /OUT:$(out) \
    266                 /MAPINFO:EXPORTS /INCREMENTAL:NO /MAPINFO:LINES \
     275                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    267276                /MAP:$(outbase).map \
    268277                $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def)) \
    … …  
    271280                $(subst /,\\,$(objs)) \
    272281                $(subst /,\\,$(libs))
    273 endef
    274 
     282        if test -f $(out).manifest; then \
     283                $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \
     284        fi
     285endef
     286
Note: See TracChangeset for help on using the changeset viewer.