diff --git a/CMakeLists.txt b/CMakeLists.txt index daa26c5b..74860fa2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,12 @@ set(PROJECT_NAME_CAPITALIZED "Flameshot") set(DEFAULT_RUN_IN_PLACE FALSE) if(WIN32) set(DEFAULT_RUN_IN_PLACE TRUE) + # For Windows RC file. + add_definitions(-DFLAMESHOT_VERSION_MAJOR=${CMAKE_PROJECT_VERSION_MAJOR}) + add_definitions(-DFLAMESHOT_VERSION_MINOR=${CMAKE_PROJECT_VERSION_MINOR}) + add_definitions(-DFLAMESHOT_VERSION_BUGFIX=${CMAKE_PROJECT_VERSION_PATCH}) + add_definitions(-DFLAMESHOT_VERSION_BUILD=1) + add_definitions(-DFLAMESHOT_VERSION_STRING="${PROJECT_VERSION}") endif() set(RUN_IN_PLACE ${DEFAULT_RUN_IN_PLACE} CACHE BOOL "Run directly in source directory structure") diff --git a/data/flameshot.rc b/data/flameshot.rc new file mode 100644 index 00000000..1fac2d6f --- /dev/null +++ b/data/flameshot.rc @@ -0,0 +1,47 @@ +#pragma code_page(65001) // UTF-8 + +IDI_ICON1 ICON "img\\app\\flameshot.ico" + +#include + +#define VER_FILEVERSION FLAMESHOT_VERSION_MAJOR,FLAMESHOT_VERSION_MINOR,FLAMESHOT_VERSION_BUGFIX,FLAMESHOT_VERSION_BUILD +#define VER_FILEVERSION_STR FLAMESHOT_VERSION_STRING + +#define VER_PRODUCTVERSION FLAMESHOT_VERSION_MAJOR,FLAMESHOT_VERSION_MINOR,FLAMESHOT_VERSION_BUGFIX,FLAMESHOT_VERSION_BUILD +#define VER_PRODUCTVERSION_STR FLAMESHOT_VERSION_STRING + +#ifndef DEBUG +#define VER_DEBUG 0 +#else +#define VER_DEBUG VS_FF_DEBUG +#endif + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VER_FILEVERSION +PRODUCTVERSION VER_PRODUCTVERSION +FILEFLAGSMASK VER_DEBUG +FILEFLAGS VER_DEBUG +FILEOS VOS__WINDOWS32 +FILETYPE VFT_APP +FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The flameshot Org." + VALUE "FileDescription", "Flameshot" + VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "InternalName", "flameshot" + VALUE "LegalCopyright", "Copyright (C) 2017-2020 flameshot.org" + VALUE "OriginalFilename", "flameshot.exe" + VALUE "ProductName", "Flameshot" + VALUE "ProductVersion", VER_PRODUCTVERSION_STR + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 0x04b0 /* U.S. English (Unicode) */ + END +END \ No newline at end of file diff --git a/data/icon.rc b/data/icon.rc deleted file mode 100644 index 2cdab732..00000000 --- a/data/icon.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "img/app/flameshot.ico" \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 96928ac6..094c6d55 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -67,7 +67,7 @@ target_sources( ${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/src/color_wheel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/include/color_wheel.hpp ${CMAKE_CURRENT_SOURCE_DIR}/../data/graphics.qrc - ${CMAKE_CURRENT_SOURCE_DIR}/../data/icon.rc # windows binary icon resource file + ${CMAKE_CURRENT_SOURCE_DIR}/../data/flameshot.rc # windows binary icon resource file ${QM_FILES} main.cpp)