From 9863f9c160cc2f2c1ac37bab93e8804bbf6e06fb Mon Sep 17 00:00:00 2001
From: PioLing <964472638@qq.com>
Date: Fri, 3 Jan 2025 11:33:35 +0800
Subject: [PATCH] Add logo and version information to exe on windows (#4093)

---
 CMakeLists.txt           |   2 +-
 api/CMakeLists.txt       |   8 ++++++-
 api/tests/CMakeLists.txt |   2 +-
 ext-codec/CMakeLists.txt |   2 +-
 player/CMakeLists.txt    |   2 +-
 resource.rc              |  44 +++++++++++++++++++++++++++++++++++++++
 server/CMakeLists.txt    |  11 +++++++++-
 src/CMakeLists.txt       |   2 +-
 srt/CMakeLists.txt       |   2 +-
 tests/CMakeLists.txt     |   2 +-
 www/logo.ico             | Bin 0 -> 1435 bytes
 11 files changed, 68 insertions(+), 9 deletions(-)
 create mode 100644 resource.rc
 create mode 100644 www/logo.ico

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f5c7123..7a844dc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2016-2022 The ZLMediaKit project authors. All Rights Reserved.
+# Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/api/CMakeLists.txt b/api/CMakeLists.txt
index 102a03a6..ef04a417 100644
--- a/api/CMakeLists.txt
+++ b/api/CMakeLists.txt
@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2016-2022 The ZLMediaKit project authors. All Rights Reserved.
+# Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -77,6 +77,12 @@ install(TARGETS mk_api
   LIBRARY DESTINATION ${INSTALL_PATH_LIB}
   RUNTIME DESTINATION ${INSTALL_PATH_RUNTIME})
 
+if(MSVC)
+  set(RESOURCE_FILE "${CMAKE_SOURCE_DIR}/resource.rc")
+  set_source_files_properties(${RESOURCE_FILE} PROPERTIES LANGUAGE RC)
+  target_sources(mk_api PRIVATE ${RESOURCE_FILE})
+endif()
+
 # IOS 跳过测试代码
 if(IOS)
   return()
diff --git a/api/tests/CMakeLists.txt b/api/tests/CMakeLists.txt
index 8108b71b..737ac6b6 100644
--- a/api/tests/CMakeLists.txt
+++ b/api/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2016-2022 The ZLMediaKit project authors. All Rights Reserved.
+# Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/ext-codec/CMakeLists.txt b/ext-codec/CMakeLists.txt
index 23190fb8..5fefad0c 100644
--- a/ext-codec/CMakeLists.txt
+++ b/ext-codec/CMakeLists.txt
@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2016-2022 The ZLMediaKit project authors. All Rights Reserved.
+# Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/player/CMakeLists.txt b/player/CMakeLists.txt
index e36b2a46..e255f139 100644
--- a/player/CMakeLists.txt
+++ b/player/CMakeLists.txt
@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2016-2022 The ZLMediaKit project authors. All Rights Reserved.
+# Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/resource.rc b/resource.rc
new file mode 100644
index 00000000..dc23bf1b
--- /dev/null
+++ b/resource.rc
@@ -0,0 +1,44 @@
+#ifdef APSTUDIO_INVOKED
+#error This file is not editable by Visual C++.
+#endif //APSTUDIO_INVOKED
+
+#include "winres.h"
+#include "ZLMVersion.h"
+#define ZLM_VERSION 8,0,0,1
+
+// 拼接 BRANCH_NAME 和 COMMIT_HASH ，例如 master - 1c8ed1c
+#define COMMIT_HASH_BRANCH_STR BRANCH_NAME " - " COMMIT_HASH 
+
+IDI_ICON1 ICON DISCARDABLE "www//logo.ico"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION ZLM_VERSION
+ PRODUCTVERSION ZLM_VERSION
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "CompanyName", "Applied ZLMediaKit Informatics Software"
+            VALUE "FileDescription", "This file is part of the C++ ZLM"
+            VALUE "FileVersion", COMMIT_HASH_BRANCH_STR
+            VALUE "InternalName", COMMIT_HASH_BRANCH_STR
+            VALUE "LegalCopyright", "Copyright (c) 2016-present The ZLMediaKit project authors"
+            VALUE "ProductName", "https://github.com/ZLMediaKit"
+            VALUE "ProductVersion", COMMIT_HASH_BRANCH_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
\ No newline at end of file
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 63abc05d..1e198208 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2016-2022 The ZLMediaKit project authors. All Rights Reserved.
+# Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -56,4 +56,13 @@ else()
   target_link_libraries(MediaServer ${MK_LINK_LIBRARIES})
 endif()
 
+if(MSVC)
+  set(RESOURCE_FILE "${CMAKE_SOURCE_DIR}/resource.rc")
+  set_source_files_properties(${RESOURCE_FILE} PROPERTIES LANGUAGE RC)  
+  target_sources(MediaServer PRIVATE ${RESOURCE_FILE})
+else()
+  # Android, IOS, macOS ...
+  # CLion, GCC ...
+endif()
+
 install(TARGETS MediaServer DESTINATION ${INSTALL_PATH_RUNTIME})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7ce2eb88..3241d9e0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2016-2022 The ZLMediaKit project authors. All Rights Reserved.
+# Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/srt/CMakeLists.txt b/srt/CMakeLists.txt
index fcbdbd8a..417c6535 100644
--- a/srt/CMakeLists.txt
+++ b/srt/CMakeLists.txt
@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2016-2022 The ZLMediaKit project authors. All Rights Reserved.
+# Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7bf8a5f0..6781dfab 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2016-2022 The ZLMediaKit project authors. All Rights Reserved.
+# Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/www/logo.ico b/www/logo.ico
new file mode 100644
index 0000000000000000000000000000000000000000..132a1ec59e14b92a9a69f41c6f89e9694bb22312
GIT binary patch
literal 1435
zcmV;M1!VdF0096205C8B0000W0EGnr02TlM0EtjeM-2)Z3IG5A4M|8uQUCw|FaQ7m
zFbD<!00374`G)`i00d`2O+f$vv5yP<VFdsH00DDSM?wIu&K&6g001CkNK#Dz0D2|>
z0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqax=}m;00jd{L_t(&f$f=FY!p=($A90M
z%kH*o3xz^$fmSISkXt~4R#FhKG+?4pgNZRF@?d;|R~|$$DqfH$PzgS%7=k`Yf*}MD
zNdUPRLqIN4P_a<TrSxLk?RIzP_^`{gb+_By(z0vpKiO<%&g9Jhch2{H=gf>~tu_B)
zscaj#SB(H<TO$D3*8dlv>a!DQtyy>A@=*H8STdM(VD0x8Idr83tpw8)y0x%r*<^N{
zyUDiYf#LAkuQCP*M;#V!J&9K0{*)m^5K!QV@YT}+N+0l0<TZ!Ox2uc+7HmGom;#%d
zoe`8NL=hYj3{waLTH;VjhzLwA^6^DYB_2aiBH0DlcH}R<Iemj*)S<jMk3X8b@Yn{y
zsE*GDpafB|8L><uqyYuCp{N|?V`t6eAq7Y~iNjHc?I#;>9F3_Ie>Me~IL1d;#KB|5
zy78I{ts$zxYYN?tCeMtug&fVV%|V{sTbCVxn$5>4De@7HI%qV8A=Ebo@p%kF;TS|$
z#DRE}bVW3N+n_Vz^y%kPTj>4+-0A2>i_mx{h{tOZbu`;oPRDN>gu^j|q4>W5hCs2;
zq`f;jq-K*TtsGdm=_q0fQ^xx_f2#whR|V2a+{D$YCy8VKv19I@7eNc0T{&aO00yjc
zYj&K$vK2)>iwie8a&GM&5a74QcEXOPG13ic=*!@}D&=^7vj2BCwue&9p~#T+l`;nw
ze|Q)zf@AcKdE6WjL#UlyLg^?kmI$T-O9V?nB&zxGYAZ*scO>M1Qo@-RrVlT`nlDdr
zrlB3J5&_1I&8KQcF}6}z3M?fF0Hz3rfT;w>aaeo2!398s<&z57G=Jjo0BEgQ`u<_p
zbZ>yAiz=`LY$e!A(gH9fR$5y_5!U^31L7d1`4;<X1Ki6FBWVt-|MpzMIgihzy1IPu
zcLK(EEw(L~fE6zW*E%CS^4&QOHU2&5K9d3*y?DFNv7v<7^UC_1^B6*f-zHGtp)AkB
z$Y2z=R+UohHQeLZkJU46*Lki7!x>nQDQO5j_3j}YrQEQY`D6vQ61+-ydrpZvg2}Y=
zQWKVfabA<jg<hJvBD93UgdL43f{KTeLin`q4kw#}ZeD1K4a~9HfV+npND1qJ<Mid3
z^28({HdPxQeK4&~0jf(20VvJ)B(ynN(;1Gk!EaOM_o77D*U-l5pRW;eG;{V`WJ12h
zfh7a)ToVBPolq(s8yn}PZ~nQ5ic+>K5&X7^-|o46O=$rao+$vJDHNq@Umbzn7bwd!
zIk=><-@Xz;Xw{Yz)VBoP5DF}+z&3<JOYz>^)DT*0F1LlKEc6ZtnXXPZ2YKnIdS0AV
z!1@^_3GIDm;8t6Rt4%>L60XBcqt?~6b`com8@$^jnl;+T*%h(p?A;A*w1%U+Tt3=u
z?=u6nZyk({yg|YYY<a9KvG*L1o9dtMi9IQO@XAc~zqzQ-MRpEu;_k`~A<IzgeP?mf
zi*ne1&kU?umb_$j-0mP0&D~E3{jL^2yitwEQd~WMn_T_`l5#ukIGQCNAH^|*6|=@O
zvB*d5w6ToMx9_LNlu8?*_jWqZYq9sWxx@0JDpRF=q+I&Z5jTU&i@bdO>YV#xDiie!
z(B9Sa*thZdsXYF0>g_?c)GxrPD=h%*T0Nh_JnOz0%2fSUA-~sT#q9ApZ5{^seIS>V
pW3Q<)*9btiH3E=rjR0g@{{Y%m)m+wWWHJB%002ovPDHLkV1fhmm4E;M

literal 0
HcmV?d00001