diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ea7d98..ebfe3fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,11 +113,14 @@ 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 "/MANIFESTINPUT:${APP_MANIFEST_NATIVE}") + endif () target_compile_options(${PROJECT_NAME} PRIVATE /EHsc) target_link_options(${PROJECT_NAME} PRIVATE /STACK:0xffffff) - target_link_options(${PROJECT_NAME} PRIVATE - "$<$:/MANIFEST:NO>" - ) target_link_options(${PROJECT_NAME} PRIVATE "$<$,$>:/SUBSYSTEM:WINDOWS>" "$<$,$>>:-mwindows>" diff --git a/anm2ed.rc b/anm2ed.rc index a764099..2609c88 100644 --- a/anm2ed.rc +++ b/anm2ed.rc @@ -1,4 +1,7 @@ #include IDI_ICON1 ICON DISCARDABLE "Icon.ico" + +#ifndef DISABLE_APP_MANIFEST_RESOURCE CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "app.manifest" +#endif