Add manifest file to resource file
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
#2075 Add manifest file to resource file
This simple patch adds manifest file to resource file.
This way the manifest file (correct one!) gets linked
into executable file and we don't need separate
manifest files anymore.
In addition to patch below, I'll move
WinMerge.exe.manifest and WinMergeU.exe.manifest files
from /Installer/InnoSetup to /Src/res
Index: Merge.rc
--- Merge.rc (revision 3745)
+++ Merge.rc (working copy)
@@ -60,6 +60,14 @@
#endif // APSTUDIO_INVOKED
+// Include the manifest file
+
+#ifdef UNICODE
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST
"res\\WinMergeU.exe.manifest"
+#else
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST
"res\\WinMerge.exe.manifest"
+#endif
+
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Logged In: YES
user_id=631874
Note to myself - this does not work properly with VS2005. I
have to fix it after this patch is committed.
Hint for the fix:
http://www.mathies.com/weblog/?p=225
Logged In: YES
user_id=631874
I added #if MSC_VER < 1400 around that #ifdef UNICODE to fix
VS2005 build and committed to SVN trunk.
Completed: At revision: 3755
Logged In: YES
user_id=631874
Committed to 2.6 branch. Closing.
Completed: At revision: 3758