diff options
| author | marha <marha@users.sourceforge.net> | 2009-08-05 15:12:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-08-05 15:12:20 +0000 |
| commit | 5a4d2414ae2ae1c3bcb70b1c7febd1423a19077f (patch) | |
| tree | ed630e468e9516fdf29c51b2009a98a4f01a823d | |
| parent | 9e5f1891047d1d1f3a86286877a13f286f9bf966 (diff) | |
| download | vcxsrv-5a4d2414ae2ae1c3bcb70b1c7febd1423a19077f.tar.gz vcxsrv-5a4d2414ae2ae1c3bcb70b1c7febd1423a19077f.tar.bz2 vcxsrv-5a4d2414ae2ae1c3bcb70b1c7febd1423a19077f.zip | |
Split manifest file in a debug and a release version.
| -rw-r--r-- | makefile.after | 4 | ||||
| -rw-r--r-- | runtime.debug.manifest | 15 | ||||
| -rw-r--r-- | runtime.manifest | 7 |
3 files changed, 20 insertions, 6 deletions
diff --git a/makefile.after b/makefile.after index 49797e51c..d024b3456 100644 --- a/makefile.after +++ b/makefile.after @@ -3,7 +3,11 @@ 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);)
diff --git a/runtime.debug.manifest b/runtime.debug.manifest new file mode 100644 index 000000000..dcc64c2a3 --- /dev/null +++ b/runtime.debug.manifest @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level='asInvoker' uiAccess='false' />
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type="win32" name="Microsoft.VC90.DebugCRT" version="9.0.30729.1" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b" />
+ </dependentAssembly>
+ </dependency>
+</assembly>
diff --git a/runtime.manifest b/runtime.manifest index 42c594257..e1888927c 100644 --- a/runtime.manifest +++ b/runtime.manifest @@ -9,12 +9,7 @@ </trustInfo>
<dependency>
<dependentAssembly>
- <assemblyIdentity type='win32' name='Microsoft.VC90.DebugCRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' />
- </dependentAssembly>
- </dependency>
- <dependency>
- <dependentAssembly>
- <assemblyIdentity type='win32' name='Microsoft.VC90.CRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' />
+ <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.1" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b" />
</dependentAssembly>
</dependency>
</assembly>
|