diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a844dc97c..035f172718 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,8 +208,8 @@ elseif(WIN32) # warning C4530: C++ exception handler used, but unwind semantics are not enabled. "/EHsc") # disable Windows logo - list(APPEND COMPILE_OPTIONS_DEFAULT "/nologo") - list(APPEND CMAKE_STATIC_LINKER_FLAGS "/nologo") + string(REPLACE "/nologo" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + set(CMAKE_STATIC_LINKER_FLAGS "") endif() endif() diff --git a/resource.rc b/resource.rc index dc23bf1bf2..8ff3a370e1 100644 --- a/resource.rc +++ b/resource.rc @@ -3,7 +3,11 @@ #endif //APSTUDIO_INVOKED #include "winres.h" + +#if defined(ENABLE_VERSION) #include "ZLMVersion.h" +#endif + #define ZLM_VERSION 8,0,0,1 // 拼接 BRANCH_NAME 和 COMMIT_HASH ,例如 master - 1c8ed1c @@ -41,4 +45,4 @@ BEGIN BEGIN VALUE "Translation", 0x0, 1200 END -END \ No newline at end of file +END