Skip to content

Commit

Permalink
Add ENABLE_VERSION macro check. (ZLMediaKit#4100)
Browse files Browse the repository at this point in the history
  • Loading branch information
PioLing authored Jan 6, 2025
1 parent 9863f9c commit b7b7989
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
6 changes: 5 additions & 1 deletion resource.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -41,4 +45,4 @@ BEGIN
BEGIN
VALUE "Translation", 0x0, 1200
END
END
END

0 comments on commit b7b7989

Please sign in to comment.