diff options
| author | marha <marha@users.sourceforge.net> | 2009-08-06 11:43:19 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-08-06 11:43:19 +0000 |
| commit | 8b7fb34c4a3483aea08ddcc697b2a11c17d2e403 (patch) | |
| tree | 7084b8e6f2965c18ef54ab4408dd489ad89cb43c /makefile.after | |
| parent | 5a4d2414ae2ae1c3bcb70b1c7febd1423a19077f (diff) | |
| download | vcxsrv-8b7fb34c4a3483aea08ddcc697b2a11c17d2e403.tar.gz vcxsrv-8b7fb34c4a3483aea08ddcc697b2a11c17d2e403.tar.bz2 vcxsrv-8b7fb34c4a3483aea08ddcc697b2a11c17d2e403.zip | |
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.
Diffstat (limited to 'makefile.after')
| -rw-r--r-- | makefile.after | 11 |
1 files changed, 5 insertions, 6 deletions
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
|