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

Timestamp:

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

Author:

bird

Message:

More or less ok now..

File:

• trunk/kBuild/tools/VCC80X86.kmk (modified) (13 diffs)

trunk/kBuild/tools/VCC80X86.kmk

@@ -34 +34 @@
 TOOL_VCC80X86_COBJSUFF           := .obj
 TOOL_VCC80X86_CFLAGS             := -TC -c -nologo
-TOOL_VCC80X86_CFLAGS.debug       := -Od -Zi
+TOOL_VCC80X86_CFLAGS.debug       := -Zi
 TOOL_VCC80X86_CFLAGS.release     := -O2
 TOOL_VCC80X86_CFLAGS.profile     := -O2
@@ -43 +43 @@
 TOOL_VCC80X86_CXXOBJSUFF         := .obj
 TOOL_VCC80X86_CXXFLAGS           := -TP -c -nologo
-TOOL_VCC80X86_CXXFLAGS.debug     := -Od -Zi
+TOOL_VCC80X86_CXXFLAGS.debug     := -Zi
 TOOL_VCC80X86_CXXFLAGS.release   := -O2
 TOOL_VCC80X86_CXXFLAGS.profile   := -O2
@@ -57 +57 @@
 
 TOOL_VCC80X86_LD                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/link.exe
-TOOL_VCC80X86_LDFLAGS            := -nologo
+TOOL_VCC80X86_LDFLAGS            := -nologo -machine:x86
 TOOL_VCC80X86_LDFLAGS.debug      := -debug
 TOOL_VCC80X86_LDFLAGS.release    :=
+
+TOOL_VCC80X86_MT                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/mt.exe
 
 ## Constructs the correct .pdb name (the name is lowercased).
@@ -69 +71 @@
 TOOL_VCC80X86_PDB                = $(1).$(2)
 endif
+
 
 #ifeq ($(BUILD_PLATFORM),win32)
@@ -191 +194 @@
 # @param    $(outbase)      Output basename (full). Use this for list files and such.
 #
-TOOL_VCC80X86_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80X86_PDB, $(outbase),pdb) $(outbase).ilk
+TOOL_VCC80X86_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80X86_PDB, $(outbase),pdb) $(outbase).ilk $(out).manifest
 TOOL_VCC80X86_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_VCC80X86_LINK_PROGRAM_DEPORD =
@@ -197 +200 @@
         $(TOOL_VCC80X86_LD) $(flags) \
                 /OUT:$(out) \
-                /MAPINFO:EXPORTS /INCREMENTAL:NO /MAPINFO:LINES \
+                /MAPINFO:EXPORTS /INCREMENTAL:NO \
                 /MAP:$(outbase).map \
                 $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def)) \
@@ -204 +207 @@
                 $(subst /,\\,$(objs)) \
                 $(subst /,\\,$(libs))
+        if test -f $(out).manifest; then \
+                $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)); \
+        fi
 endef
 
@@ -221 +227 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC80X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80X86_PDB, $(outbase),pdb) $(outbase).ilk
+TOOL_VCC80X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80X86_PDB, $(outbase),pdb) $(outbase).ilk $(out).manifest
 TOOL_VCC80X86_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_VCC80X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
@@ -228 +234 @@
                 /OUT:$(out) \
                 /IMPLIB:$(outbase).lib \
-                /MAPINFO:EXPORTS /INCREMENTAL:NO /MAPINFO:LINES \
+                /MAPINFO:EXPORTS /INCREMENTAL:NO \
                 /MAP:$(outbase).map \
                 /DLL \
@@ -236 +242 @@
                 $(subst /,\\,$(objs)) \
                 $(subst /,\\,$(libs))
+        if test -f $(out).manifest; then \
+                $(TOOL_VCC80X86_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
@@ -258 +267 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC80X86_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80X86_PDB, $(outbase),pdb) $(outbase).ilk
+TOOL_VCC80X86_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC80X86_PDB, $(outbase),pdb) $(outbase).ilk $(out).manifest
 TOOL_VCC80X86_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_VCC80X86_LINK_SYSMOD_DEPORD =
@@ -264 +273 @@
         $(TOOL_VCC80X86_LD) $(flags) \
                 /OUT:$(out) \
-                /MAPINFO:EXPORTS /INCREMENTAL:NO /MAPINFO:LINES \
+                /MAPINFO:EXPORTS /INCREMENTAL:NO \
                 /MAP:$(outbase).map \
                 $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def)) \
@@ -271 +280 @@
                 $(subst /,\\,$(objs)) \
                 $(subst /,\\,$(libs))
-endef
-
+        if test -f $(out).manifest; then \
+                $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \
+        fi
+endef
+