amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-24 11:40:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix macOS compile error by rename version.h -> ZLMVersion.h (#3411 #3410)

Browse Source
This commit is contained in:
Jacob Su 2024-03-24 17:18:18 +08:00 committed by GitHub
parent 7aaafa18e7
commit 208f57e2cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -141,8 +141,8 @@ if(GIT_FOUND)
endif() endif()
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/version.h.ini ${CMAKE_CURRENT_SOURCE_DIR}/ZLMVersion.h.ini
${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/ZLMVersion.h
@ONLY) @ONLY)
message(STATUS "Git version is ${BRANCH_NAME} ${COMMIT_HASH}/${COMMIT_TIME} ${BUILD_TIME}") message(STATUS "Git version is ${BRANCH_NAME} ${COMMIT_HASH}/${COMMIT_TIME} ${BUILD_TIME}")
@ -537,4 +537,4 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/default.pem" DESTINATION ${EXECUTABLE_OUT
# Copy the default background image used by VideoStack when there is no video stream # Copy the default background image used by VideoStack when there is no video stream
if (ENABLE_FFMPEG AND ENABLE_X264) if (ENABLE_FFMPEG AND ENABLE_X264)
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/conf/novideo.yuv" DESTINATION ${EXECUTABLE_OUTPUT_PATH}) file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/conf/novideo.yuv" DESTINATION ${EXECUTABLE_OUTPUT_PATH})
endif () endif ()

0
version.h.ini → ZLMVersion.h.ini
View File

2
server/WebApi.cpp
View File

@ -59,7 +59,7 @@
#endif #endif
#if defined(ENABLE_VERSION) #if defined(ENABLE_VERSION)
#include "version.h" #include "ZLMVersion.h"
#endif #endif
#if defined(ENABLE_X264) && defined (ENABLE_FFMPEG) #if defined(ENABLE_X264) && defined (ENABLE_FFMPEG)

2
server/main.cpp
View File

@ -38,7 +38,7 @@
#endif #endif
#if defined(ENABLE_VERSION) #if defined(ENABLE_VERSION)
#include "version.h" #include "ZLMVersion.h"
#endif #endif
#if !defined(_WIN32) #if !defined(_WIN32)

4
src/Common/macros.cpp
View File

@ -14,7 +14,7 @@
using namespace toolkit; using namespace toolkit;
#if defined(ENABLE_VERSION) #if defined(ENABLE_VERSION)
#include "version.h" #include "ZLMVersion.h"
#endif #endif
extern "C" { extern "C" {
@ -44,4 +44,4 @@ const char kServerName[] = "ZLMediaKit-8.0(build in " __DATE__ " " __TIME__ ")"
const char kServerName[] = "ZLMediaKit(git hash:" COMMIT_HASH "/" COMMIT_TIME ",branch:" BRANCH_NAME ",build time:" BUILD_TIME ")"; const char kServerName[] = "ZLMediaKit(git hash:" COMMIT_HASH "/" COMMIT_TIME ",branch:" BRANCH_NAME ",build time:" BUILD_TIME ")";
#endif #endif
}//namespace mediakit }//namespace mediakit