diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca2d1d6..288e9ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,13 +113,13 @@ endif()
 if (WIN32)
     enable_language(RC)
     target_sources(${PROJECT_NAME} PRIVATE anm2ed.rc)
-    if (MSVC)
-        set_source_files_properties(anm2ed.rc PROPERTIES COMPILE_DEFINITIONS DISABLE_APP_MANIFEST_RESOURCE)
-        set(APP_MANIFEST "${CMAKE_CURRENT_SOURCE_DIR}/app.manifest")
-        file(TO_NATIVE_PATH "${APP_MANIFEST}" APP_MANIFEST_NATIVE)
-        target_link_options(${PROJECT_NAME} PRIVATE "/MANIFEST:EMBED")
-        target_link_options(${PROJECT_NAME} PRIVATE "/MANIFESTINPUT:${APP_MANIFEST_NATIVE}")
-    endif ()
+    set(APP_MANIFEST "${CMAKE_CURRENT_SOURCE_DIR}/app.manifest")
+    file(TO_NATIVE_PATH "${APP_MANIFEST}" APP_MANIFEST_NATIVE)
+    set(APP_MANIFEST_DEF "APP_MANIFEST_FILE=\\\"${APP_MANIFEST_NATIVE}\\\"")
+    set_source_files_properties(anm2ed.rc PROPERTIES
+            COMPILE_DEFINITIONS "${APP_MANIFEST_DEF}"
+            OBJECT_DEPENDS "${APP_MANIFEST}"
+    )
     target_compile_options(${PROJECT_NAME} PRIVATE /EHsc)
     target_link_options(${PROJECT_NAME} PRIVATE /STACK:0xffffff)
     target_link_options(${PROJECT_NAME} PRIVATE
diff --git a/anm2ed.rc b/anm2ed.rc
index 2609c88..5f4ab68 100644
--- a/anm2ed.rc
+++ b/anm2ed.rc
@@ -1,7 +1,8 @@
 #include <windows.h>
 
-IDI_ICON1                 ICON          DISCARDABLE    "Icon.ico"
-
-#ifndef DISABLE_APP_MANIFEST_RESOURCE
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST        "app.manifest"
+#ifndef APP_MANIFEST_FILE
+#define APP_MANIFEST_FILE "app.manifest"
 #endif
+
+1 RT_MANIFEST                      APP_MANIFEST_FILE
+IDI_ICON1                 ICON     DISCARDABLE    "Icon.ico"
diff --git a/app.manifest b/app.manifest
index 05b442e..09c0d05 100644
--- a/app.manifest
+++ b/app.manifest
@@ -1,8 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <application>
-    <windowsSettings>
-      <activeCodePage>UTF-8</activeCodePage>
-    </windowsSettings>
-  </application>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+    <assemblyIdentity type="win32" name="UTF-8 message box" version="1.0.0.0"/>
+    <application>
+        <windowsSettings>
+            <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings"
+                >UTF-8</activeCodePage>
+        </windowsSettings>
+    </application>
+    <dependency>
+        <dependentAssembly>
+            <assemblyIdentity
+                type="win32"
+                name="Microsoft.Windows.Common-Controls"
+                version="6.0.0.0"
+                processorArchitecture="*"
+                publicKeyToken="6595b64144ccf1df"
+                language="*"
+                />
+        </dependentAssembly>
+    </dependency>
 </assembly>
\ No newline at end of file