diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index c78c01e..59beddd 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -66,7 +66,8 @@ endif() if(WIN32 AND NOT FRAMELESSHELPER_BUILD_STATIC) enable_language(RC) - configure_file(framelesshelpercore.rc.in + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/framelesshelper.rc.in ${CMAKE_CURRENT_BINARY_DIR}/framelesshelpercore.rc @ONLY) list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/framelesshelpercore.rc diff --git a/src/core/framelesshelpercore.rc.in b/src/core/framelesshelper.rc.in similarity index 86% rename from src/core/framelesshelpercore.rc.in rename to src/core/framelesshelper.rc.in index aa81e4b..bf09e55 100644 --- a/src/core/framelesshelpercore.rc.in +++ b/src/core/framelesshelper.rc.in @@ -42,17 +42,16 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "wangwenx190\0" - VALUE "FileDescription", "FramelessHelper Core Module\0" + VALUE "FileDescription", "@PROJECT_NAME@ @SUB_MOD_NAME@ Module\0" VALUE "FileVersion", "0.0.0.0\0" VALUE "LegalCopyright", "MIT License\0" #ifdef _DEBUG - VALUE "OriginalFilename", "FramelessHelperCored.dll\0" + VALUE "OriginalFilename", "@PROJECT_NAME@@SUB_MOD_NAME@d.dll\0" #else - VALUE "OriginalFilename", "FramelessHelperCore.dll\0" + VALUE "OriginalFilename", "@PROJECT_NAME@@SUB_MOD_NAME@.dll\0" #endif - VALUE "ProductName", "FramelessHelper\0" + VALUE "ProductName", "@PROJECT_NAME@\0" VALUE "ProductVersion", "@PROJECT_VERSION@\0" - VALUE "InternalName", "FramelessHelperCore\0" VALUE "Comments", "Built from commit @PROJECT_VERSION_COMMIT@ on @PROJECT_COMPILE_DATETIME@ (UTC).\0" END END diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index 923d2af..497a6c1 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -50,7 +50,8 @@ set(SOURCES if(WIN32 AND NOT FRAMELESSHELPER_BUILD_STATIC) enable_language(RC) - configure_file(framelesshelperquick.rc.in + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/../core/framelesshelper.rc.in ${CMAKE_CURRENT_BINARY_DIR}/framelesshelperquick.rc @ONLY) list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/framelesshelperquick.rc @@ -116,5 +117,4 @@ target_link_libraries(${SUB_PROJ_NAME} PUBLIC target_include_directories(${SUB_PROJ_NAME} PUBLIC "$/${INCLUDE_PREFIX}" "$/${INCLUDE_PREFIX}/private" - "$" ) diff --git a/src/quick/framelesshelperquick.rc.in b/src/quick/framelesshelperquick.rc.in deleted file mode 100644 index 2014009..0000000 --- a/src/quick/framelesshelperquick.rc.in +++ /dev/null @@ -1,63 +0,0 @@ -/* - * MIT License - * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#include - -VS_VERSION_INFO VERSIONINFO -FILEVERSION 0,0,0,0 -PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,@PROJECT_VERSION_TWEAK@ -FILEFLAGSMASK 0x3fL -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#else -FILEFLAGS 0x0L -#endif -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_DLL -FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "wangwenx190\0" - VALUE "FileDescription", "FramelessHelper Quick Module\0" - VALUE "FileVersion", "0.0.0.0\0" - VALUE "LegalCopyright", "MIT License\0" - #ifdef _DEBUG - VALUE "OriginalFilename", "FramelessHelperQuickd.dll\0" - #else - VALUE "OriginalFilename", "FramelessHelperQuick.dll\0" - #endif - VALUE "ProductName", "FramelessHelper\0" - VALUE "ProductVersion", "@PROJECT_VERSION@\0" - VALUE "InternalName", "FramelessHelperQuick\0" - VALUE "Comments", "Built from commit @PROJECT_VERSION_COMMIT@ on @PROJECT_COMPILE_DATETIME@ (UTC).\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index dd06902..03b4d28 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -50,7 +50,8 @@ set(SOURCES if(WIN32 AND NOT FRAMELESSHELPER_BUILD_STATIC) enable_language(RC) - configure_file(framelesshelperwidgets.rc.in + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/../core/framelesshelper.rc.in ${CMAKE_CURRENT_BINARY_DIR}/framelesshelperwidgets.rc @ONLY) list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/framelesshelperwidgets.rc @@ -105,5 +106,4 @@ target_link_libraries(${SUB_PROJ_NAME} PUBLIC target_include_directories(${SUB_PROJ_NAME} PUBLIC "$/${INCLUDE_PREFIX}" "$/${INCLUDE_PREFIX}/private" - "$" ) diff --git a/src/widgets/framelesshelperwidgets.rc.in b/src/widgets/framelesshelperwidgets.rc.in deleted file mode 100644 index 480a117..0000000 --- a/src/widgets/framelesshelperwidgets.rc.in +++ /dev/null @@ -1,63 +0,0 @@ -/* - * MIT License - * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#include - -VS_VERSION_INFO VERSIONINFO -FILEVERSION 0,0,0,0 -PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,@PROJECT_VERSION_TWEAK@ -FILEFLAGSMASK 0x3fL -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#else -FILEFLAGS 0x0L -#endif -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_DLL -FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "wangwenx190\0" - VALUE "FileDescription", "FramelessHelper Widgets Module\0" - VALUE "FileVersion", "0.0.0.0\0" - VALUE "LegalCopyright", "MIT License\0" - #ifdef _DEBUG - VALUE "OriginalFilename", "FramelessHelperWidgetsd.dll\0" - #else - VALUE "OriginalFilename", "FramelessHelperWidgets.dll\0" - #endif - VALUE "ProductName", "FramelessHelper\0" - VALUE "ProductVersion", "@PROJECT_VERSION@\0" - VALUE "InternalName", "FramelessHelperWidgets\0" - VALUE "Comments", "Built from commit @PROJECT_VERSION_COMMIT@ on @PROJECT_COMPILE_DATETIME@ (UTC).\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END