Changeset 437 for trunk/kBuild/tools/VCC80AMD64.kmk

Timestamp:

May 27, 2006, 2:45:08 PM (19 years ago)

Author:

bird

Message:

More or less ok now..

File:

• trunk/kBuild/tools/VCC80AMD64.kmk (modified) (12 diffs)

trunk/kBuild/tools/VCC80AMD64.kmk

@@ -29 +29 @@
 PATH_TOOL_VCC80AMD64               ?= $(PATH_DEV)/x86.win32/vcc80
 PATH_TOOL_VCC80AMD64_LIB           ?= $(PATH_DEV)/x86.win32/vcc80/lib
-ifeq ($(BUILD_PLATFORM),win64
-PATH_TOOL_VCC80AMD64_BIN           ?= $(PATH_DEV)/x86.win32/vcc80/amd64/bin
+ifeq ($(BUILD_PLATFORM),win64)
+PATH_TOOL_VCC80AMD64_BIN           ?= $(PATH_DEV)/x86.win32/vcc80/bin/amd64
 else
-PATH_TOOL_VCC80AMD64_BIN           ?= $(PATH_DEV)/x86.win32/vcc80/x86_amd64/bin
-endif
-
-TOOL_VCC80AMD64_CC                 := $(EXEC_AMD64_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/cl.exe
+PATH_TOOL_VCC80AMD64_BIN           ?= $(PATH_DEV)/x86.win32/vcc80/bin/x86_amd64
+endif
+
+TOOL_VCC80AMD64_CC                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/cl.exe
 TOOL_VCC80AMD64_COBJSUFF           := .obj
 TOOL_VCC80AMD64_CFLAGS             := -TC -c -nologo
@@ -44 +44 @@
 TOOL_VCC80AMD64_CDEFS              :=
 
-TOOL_VCC80AMD64_CXX                := $(EXEC_AMD64_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/cl.exe
+TOOL_VCC80AMD64_CXX                := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/cl.exe
 TOOL_VCC80AMD64_CXXOBJSUFF         := .obj
 TOOL_VCC80AMD64_CXXFLAGS           := -TP -c -nologo
@@ -53 +53 @@
 TOOL_VCC80AMD64_CXXDEFS            :=
 
-TOOL_VCC80AMD64_AS                 := $(EXEC_AMD64_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/ml.exe
+TOOL_VCC80AMD64_AS                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/ml.exe
 TOOL_VCC80AMD64_ASOBJSUFF          := .obj
 
-TOOL_VCC80AMD64_AR                 := $(EXEC_AMD64_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/lib.exe
+TOOL_VCC80AMD64_AR                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/lib.exe
 TOOL_VCC80AMD64_ARFLAGS            := -nologo
 TOOL_VCC80AMD64_ARLIBSUFF          := .lib
 
-TOOL_VCC80AMD64_LD                 := $(EXEC_AMD64_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/link.exe
-TOOL_VCC80AMD64_LDFLAGS            := -nologo
+TOOL_VCC80AMD64_LD                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/link.exe
+TOOL_VCC80AMD64_LDFLAGS            := -nologo -machine:amd64
 TOOL_VCC80AMD64_LDFLAGS.debug      := -debug
 TOOL_VCC80AMD64_LDFLAGS.release    :=
+
+TOOL_VCC80AMD64_MT                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/mt.exe
+
 
 ## Constructs the correct .pdb name (the name is lowercased).
@@ -195 +198 @@
 # @param    $(outbase)      Output basename (full). Use this for list files and such.
 #
-TOOL_VCC80AMD64_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80AMD64_PDB, $(outbase),pdb) $(outbase).ilk
+TOOL_VCC80AMD64_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80AMD64_PDB, $(outbase),pdb) $(outbase).ilk $(out).manifest
 TOOL_VCC80AMD64_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_VCC80AMD64_LINK_PROGRAM_DEPORD =
@@ -201 +204 @@
         $(TOOL_VCC80AMD64_LD) $(flags) \
                 /OUT:$(out) \
-                /MAPINFO:EXPORTS /INCREMENTAL:NO /MAPINFO:LINES \
+                /MAPINFO:EXPORTS /INCREMENTAL:NO \
                 /MAP:$(outbase).map \
                 $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def)) \
@@ -208 +211 @@
                 $(subst /,\\,$(objs)) \
                 $(subst /,\\,$(libs))
+        if test -f $(out).manifest; then \
+                $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)); \
+        fi
 endef
 
@@ -225 +231 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC80AMD64_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80AMD64_PDB, $(outbase),pdb) $(outbase).ilk
+TOOL_VCC80AMD64_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80AMD64_PDB, $(outbase),pdb) $(outbase).ilk $(out).manifest
 TOOL_VCC80AMD64_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_VCC80AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
@@ -232 +238 @@
                 /OUT:$(out) \
                 /IMPLIB:$(outbase).lib \
-                /MAPINFO:EXPORTS /INCREMENTAL:NO /MAPINFO:LINES \
+                /MAPINFO:EXPORTS /INCREMENTAL:NO \
                 /MAP:$(outbase).map \
                 /DLL \
@@ -240 +246 @@
                 $(subst /,\\,$(objs)) \
                 $(subst /,\\,$(libs))
+        if test -f $(out).manifest; then \
+                $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \
+        fi
 ifeq ($(filter %.exp .def,$(othersrc)),)
         if test -f $(outbase).exp; then $(CP_EXT) $(outbase).exp $(PATH_LIB)/; fi
@@ -262 +271 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC80AMD64_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80AMD64_PDB, $(outbase),pdb) $(outbase).ilk
+TOOL_VCC80AMD64_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80AMD64_PDB, $(outbase),pdb) $(outbase).ilk $(out).manifest
 TOOL_VCC80AMD64_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_VCC80AMD64_LINK_SYSMOD_DEPORD =
@@ -268 +277 @@
         $(TOOL_VCC80AMD64_LD) $(flags) \
                 /OUT:$(out) \
-                /MAPINFO:EXPORTS /INCREMENTAL:NO /MAPINFO:LINES \
+                /MAPINFO:EXPORTS /INCREMENTAL:NO \
                 /MAP:$(outbase).map \
                 $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def)) \
@@ -275 +284 @@
                 $(subst /,\\,$(objs)) \
                 $(subst /,\\,$(libs))
-endef
-
+        if test -f $(out).manifest; then \
+                $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \
+        fi
+endef
+