add Manifests to rbutil, sansapatcher and e200rpatcher to gain needed rights on windows vista.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16120 a1c6a512-1295-4272-9138-f99709370657

8 files changed, 54 insertions, 4 deletions

diff --git a/rbutil/e200rpatcher/Makefile b/rbutil/e200rpatcher/Makefile
index 73ac574651..d015d10f3c 100644
--- a/rbutil/e200rpatcher/Makefile
+++ b/rbutil/e200rpatcher/Makefile
@@ -14,6 +14,7 @@ WINLIBS = -I libusb-win32-device-bin-0.1.12.1/include libusb-win32-device-bin-0.
 
 NATIVECC = gcc
 CC = $(CROSS)gcc
+WINDRES = $(CROSS)windres
 
 all: $(OUTPUT)
 
@@ -21,9 +22,12 @@ e200rpatcher: e200rpatcher.c bootimg.c
         gcc $(CFLAGS) $(LIBS) -o e200rpatcher e200rpatcher.c bootimg.c
         strip e200rpatcher
 
-e200rpatcher.exe:  e200rpatcher.c bootimg.c
-        $(CC) $(CFLAGS) $(WINLIBS) -o e200rpatcher.exe e200rpatcher.c bootimg.c
+e200rpatcher.exe:  e200rpatcher.c bootimg.c  e200rpatcher-rc.o
+        $(CC) $(CFLAGS) $(WINLIBS) -o e200rpatcher.exe e200rpatcher.c bootimg.c e200rpatcher-rc.o
         $(CROSS)strip e200rpatcher.exe
+    
+e200rpatcher-rc.o: e200rpatcher.rc e200rpatcher.manifest
+        $(WINDRES) -i e200rpatcher.rc -o e200rpatcher-rc.o
 
 e200rpatcher-mac: e200rpatcher-i386 e200rpatcher-ppc
         lipo -create e200rpatcher-ppc e200rpatcher-i386 -output e200rpatcher-mac
diff --git a/rbutil/e200rpatcher/e200rpatcher.manifest b/rbutil/e200rpatcher/e200rpatcher.manifest
new file mode 100644
index 0000000000..ec0c49df33
--- /dev/null
+++ b/rbutil/e200rpatcher/e200rpatcher.manifest
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="e200rpatcher.exe" type="win32"/>
+
+  <!-- Identify the application security requirements. -->
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="requireAdministrator"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git a/rbutil/e200rpatcher/e200rpatcher.rc b/rbutil/e200rpatcher/e200rpatcher.rc
new file mode 100644
index 0000000000..dae43bc26c
--- /dev/null
+++ b/rbutil/e200rpatcher/e200rpatcher.rc
@@ -0,0 +1 @@
+1 24 MOVEABLE PURE "e200rpatcher.manifest"

diff --git a/rbutil/rbutilqt/rbutilqt.manifest b/rbutil/rbutilqt/rbutilqt.manifest
new file mode 100644
index 0000000000..148058c250
--- /dev/null
+++ b/rbutil/rbutilqt/rbutilqt.manifest
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="rbutilqt.exe" type="win32"/>
+
+  <!-- Identify the application security requirements. -->
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="requireAdministrator"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git a/rbutil/rbutilqt/rbutilqt.rc b/rbutil/rbutilqt/rbutilqt.rc
index 2fec2d4aa8..93beece971 100644
--- a/rbutil/rbutilqt/rbutilqt.rc
+++ b/rbutil/rbutilqt/rbutilqt.rc
@@ -1 +1,2 @@
+1 24 MOVEABLE PURE "rbutilqt.manifest"

 RBUTIL_ICON               ICON    DISCARDABLE     "icons/rockbox.ico"

diff --git a/rbutil/sansapatcher/Makefile b/rbutil/sansapatcher/Makefile
index c425bbc892..2c75b0caf7 100644
--- a/rbutil/sansapatcher/Makefile
+++ b/rbutil/sansapatcher/Makefile
@@ -16,6 +16,7 @@ endif
 
 NATIVECC = gcc
 CC = $(CROSS)gcc
+WINDRES = $(CROSS)windres
 
 all: $(OUTPUT)
 
@@ -23,10 +24,13 @@ sansapatcher: main.c sansapatcher.c sansaio-posix.c parttypes.h bootimg_c200.c b
         gcc $(CFLAGS) -o sansapatcher main.c sansapatcher.c sansaio-posix.c bootimg_c200.c bootimg_e200.c
         strip sansapatcher
 
-sansapatcher.exe: main.c sansapatcher.c sansaio-win32.c parttypes.h bootimg_c200.c bootimg_e200.c
-        $(CC) $(CFLAGS) -o sansapatcher.exe main.c sansapatcher.c sansaio-win32.c bootimg_c200.c bootimg_e200.c
+sansapatcher.exe: main.c sansapatcher.c sansaio-win32.c parttypes.h bootimg_c200.c bootimg_e200.c  sansapatcher-rc.o
+        $(CC) $(CFLAGS) -o sansapatcher.exe main.c sansapatcher.c sansaio-win32.c bootimg_c200.c bootimg_e200.c  sansapatcher-rc.o
         $(CROSS)strip sansapatcher.exe
 
+sansapatcher-rc.o: sansapatcher.rc sansapatcher.manifest
+        $(WINDRES) -i sansapatcher.rc -o sansapatcher-rc.o
+    
 sansapatcher-mac: sansapatcher-i386 sansapatcher-ppc
         lipo -create sansapatcher-ppc sansapatcher-i386 -output sansapatcher-mac
 
diff --git a/rbutil/sansapatcher/sansapatcher.manifest b/rbutil/sansapatcher/sansapatcher.manifest
new file mode 100644
index 0000000000..71bb153688
--- /dev/null
+++ b/rbutil/sansapatcher/sansapatcher.manifest
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="sansapatcher.exe" type="win32"/>
+
+  <!-- Identify the application security requirements. -->
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="requireAdministrator"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git a/rbutil/sansapatcher/sansapatcher.rc b/rbutil/sansapatcher/sansapatcher.rc
new file mode 100644
index 0000000000..7040637a0d
--- /dev/null
+++ b/rbutil/sansapatcher/sansapatcher.rc
@@ -0,0 +1 @@
+1 24 MOVEABLE PURE "sansapatcher.manifest"