VOXEDIT: added icon as png and fixed manifests and resource definitions

cmake/macros.cmake

@@ -36,6 +36,8 @@ macro(engine_add_executable)
 	set(APPICON "${_EXE_TARGET}-icon")
 	if (APPLE)
 		set(ICON "${APPICON}.icns")
+	elseif (WIN32)
+		set(ICON "${APPICON}.ico")
 	else()
 		set(ICON "${APPICON}.png")
 	endif()

contrib/installer/windows/application.manifest.in

@@ -1,14 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"
           xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-<asmv3:application>
-  <asmv3:windowsSettings>
-    <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-      true/pm
-    </dpiAware> <!-- legacy -->
-    <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
-      permonitorv2,permonitor
-    </dpiAwareness> <!-- falls back to pm if pmv2 is not available -->
-  </asmv3:windowsSettings>
-</asmv3:application>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <asmv3:application>
+    <asmv3:windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+        true/pm
+      </dpiAware> <!-- legacy -->
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+        permonitorv2,permonitor
+      </dpiAwareness> <!-- falls back to pm if pmv2 is not available -->
+    </asmv3:windowsSettings>
+  </asmv3:application>
 </assembly>
 <!-- kate: hl xml; -->

contrib/installer/windows/application.rc.in

@@ -1,28 +1,24 @@
 #include "winresrc.h"
 
-#ifdef HAVE_CONFIG_H
-#include "engine-config.h"
-#endif
-
-1 RT_MANIFEST DISCARDABLE "application.manifest"
+//CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE "application.manifest"
 
 #define HAS_ICON @HAS_ICON@
-#define IDI_ICON 1001
+#define IDI_ICON 101
 #if HAS_ICON > 0
-IDI_ICON ICON DISCARDABLE "@ICON@"
+IDI_ICON ICON DISCARDABLE "@ICON_FULL_PATH@"
 #endif
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@CMAKE_PROJECT_VERSION_TWEAK@
- FILEFLAGSMASK 0x17L // VS_FFI_FILEFLAGMASK
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef DEBUG
- FILEFLAGS 0x3L // VS_FF_DEBUG
+ FILEFLAGS VS_FF_DEBUG
 #else
- FILEFLAGS 0x2L
+ FILEFLAGS 0
 #endif
- FILEOS 0x4L // VOS_NT_WINDOWS32
- FILETYPE 0x1L // VFT_APP
- FILESUBTYPE 0x0L // VFT2_UNKNONW
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE VFT2_UNKNOWN
 BEGIN
  BLOCK "StringFileInfo"
  BEGIN
@@ -33,8 +29,8 @@ BEGIN
    VALUE "FileDescription", "@DESCRIPTION@\0"
    VALUE "FileVersion", "@CMAKE_PROJECT_VERSION@\0"
    VALUE "InternalName", "@NAME@\0"
-   VALUE "LegalCopyright", "Copyright (C) 2015-2019\0"
-   VALUE "OriginalFilename", "@COMMANDLINE@\0"
+   VALUE "LegalCopyright", "Copyright \xA9 2015-2019\0"
+   VALUE "OriginalFilename", "@COMMANDLINE@@CMAKE_EXECUTABLE_SUFFIX@\0"
    VALUE "ProductName", "@NAME@\0"
    VALUE "ProductVersion", "@CMAKE_PROJECT_VERSION@\0"
    VALUE "SpecialBuild", "@CMAKE_BUILD_TYPE@\0"