From 208f57e2cd69f58c948b58231f376f58c6861bde Mon Sep 17 00:00:00 2001 From: Jacob Su Date: Sun, 24 Mar 2024 17:18:18 +0800 Subject: [PATCH] Fix macOS compile error by rename version.h -> ZLMVersion.h (#3411 #3410) --- CMakeLists.txt | 6 +++--- version.h.ini => ZLMVersion.h.ini | 0 server/WebApi.cpp | 2 +- server/main.cpp | 2 +- src/Common/macros.cpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) rename version.h.ini => ZLMVersion.h.ini (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d951bc3b..1adefab1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,8 +141,8 @@ if(GIT_FOUND) endif() configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/version.h.ini - ${CMAKE_CURRENT_BINARY_DIR}/version.h + ${CMAKE_CURRENT_SOURCE_DIR}/ZLMVersion.h.ini + ${CMAKE_CURRENT_BINARY_DIR}/ZLMVersion.h @ONLY) 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 if (ENABLE_FFMPEG AND ENABLE_X264) file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/conf/novideo.yuv" DESTINATION ${EXECUTABLE_OUTPUT_PATH}) -endif () \ No newline at end of file +endif () diff --git a/version.h.ini b/ZLMVersion.h.ini similarity index 100% rename from version.h.ini rename to ZLMVersion.h.ini diff --git a/server/WebApi.cpp b/server/WebApi.cpp index 5f64e073..edbf90bc 100755 --- a/server/WebApi.cpp +++ b/server/WebApi.cpp @@ -59,7 +59,7 @@ #endif #if defined(ENABLE_VERSION) -#include "version.h" +#include "ZLMVersion.h" #endif #if defined(ENABLE_X264) && defined (ENABLE_FFMPEG) diff --git a/server/main.cpp b/server/main.cpp index c25a89fb..8449f102 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -38,7 +38,7 @@ #endif #if defined(ENABLE_VERSION) -#include "version.h" +#include "ZLMVersion.h" #endif #if !defined(_WIN32) diff --git a/src/Common/macros.cpp b/src/Common/macros.cpp index 3cb95c7b..5e403b6a 100644 --- a/src/Common/macros.cpp +++ b/src/Common/macros.cpp @@ -14,7 +14,7 @@ using namespace toolkit; #if defined(ENABLE_VERSION) -#include "version.h" +#include "ZLMVersion.h" #endif 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 ")"; #endif -}//namespace mediakit \ No newline at end of file +}//namespace mediakit