From 8b7fb34c4a3483aea08ddcc697b2a11c17d2e403 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 6 Aug 2009 11:43:19 +0000 Subject: Generate the manifest file at run-time (taking the latest version of the runtime installed) Installer: used the latest version of the run-time installed. --- makefile.after | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'makefile.after') diff --git a/makefile.after b/makefile.after index d024b3456..18b1d6f25 100644 --- a/makefile.after +++ b/makefile.after @@ -3,12 +3,6 @@ OBJS:=$(OBJS:%.cc=$(OBJDIR)$/%$(OBJEXT)) RESOBJS:=$(RESOURCES:%.rc=$(OBJDIR)$/%.res) -ifeq ($(DEBUG),1) -MANIFESTFILE:=$(MHMAKECONF)\runtime.debug.manifest -else -MANIFESTFILE:=$(MHMAKECONF)\runtime.manifest -endif - ifdef SUBDIRS load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);) all: $(SUBDIRS:%=%\all) @@ -34,8 +28,13 @@ PDB := $(EXE:%.exe=%.pdb) #LINKFLAGS += /SUBSYSTEM:WINDOWS +MANIFESTFILE:=$(OBJDIR)\runtime.manifest + all: $(EXE) +$(MANIFESTFILE): + $(MHMAKECONF)/tools/genruntimemanifest $@ $(DEBUG) + $(EXE) : $(OBJS) $(INCLUDELIBFILES) $(RESOBJS) $(MANIFESTFILE) $(LINK) $(LINKFLAGS) /MANIFEST:NO /OUT:$(relpath $@) $(INCLUDELIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(OBJS) $(RESOBJS) mt -nologo -manifest $(MANIFESTFILE) -outputresource:$(relpath $@);\#1 -- cgit v1.2.3