mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-11-25 20:27:34 +08:00
添加mac版本二进制文件
This commit is contained in:
parent
5bcdb7fb53
commit
fa60a3c1d8
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
release/ filter=lfs diff=lfs merge=lfs -text
|
@ -2,13 +2,34 @@
|
|||||||
cmake_minimum_required(VERSION 3.1.3)
|
cmake_minimum_required(VERSION 3.1.3)
|
||||||
#使能c++11
|
#使能c++11
|
||||||
set(CMAKE_CXX_STANDARD 11)
|
set(CMAKE_CXX_STANDARD 11)
|
||||||
|
|
||||||
#加载自定义模块
|
#加载自定义模块
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
|
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
|
||||||
#设置库文件路径
|
|
||||||
set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
|
#set(CMAKE_BUILD_TYPE "Release")
|
||||||
#设置可执行程序路径
|
|
||||||
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
|
if(${CMAKE_BUILD_TYPE} MATCHES "Release")
|
||||||
|
message(STATUS "Release版本")
|
||||||
|
set(BuildType "Release")
|
||||||
|
else()
|
||||||
|
set(BuildType "Debug")
|
||||||
|
message(STATUS "Debug版本")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
#设置bin和lib库目录
|
||||||
|
set(RELEASE_DIR ${CMAKE_SOURCE_DIR}/release)
|
||||||
|
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||||
|
SET(LIBRARY_OUTPUT_PATH ${RELEASE_DIR}/linux/${BuildType})
|
||||||
|
SET(EXECUTABLE_OUTPUT_PATH ${RELEASE_DIR}/linux/${BuildType})
|
||||||
|
elseif (CMAKE_SYSTEM_NAME MATCHES "Windows")
|
||||||
|
SET(LIBRARY_OUTPUT_PATH ${RELEASE_DIR}/windows)
|
||||||
|
SET(EXECUTABLE_OUTPUT_PATH ${RELEASE_DIR}/windows)
|
||||||
|
elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
||||||
|
SET(LIBRARY_OUTPUT_PATH ${RELEASE_DIR}/mac/${BuildType})
|
||||||
|
SET(EXECUTABLE_OUTPUT_PATH ${RELEASE_DIR}/mac/${BuildType})
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH})
|
||||||
|
|
||||||
|
|
||||||
#设置工程源码根目录
|
#设置工程源码根目录
|
||||||
set(ToolKit_Root ${CMAKE_SOURCE_DIR}/3rdpart/ZLToolKit/src)
|
set(ToolKit_Root ${CMAKE_SOURCE_DIR}/3rdpart/ZLToolKit/src)
|
||||||
|
BIN
release/mac/Release/MediaServer
Executable file
BIN
release/mac/Release/MediaServer
Executable file
Binary file not shown.
BIN
release/mac/Release/libcrypto.1.0.0.dylib
Normal file
BIN
release/mac/Release/libcrypto.1.0.0.dylib
Normal file
Binary file not shown.
BIN
release/mac/Release/libfaac.0.0.0.dylib
Normal file
BIN
release/mac/Release/libfaac.0.0.0.dylib
Normal file
Binary file not shown.
BIN
release/mac/Release/libflv.a
Normal file
BIN
release/mac/Release/libflv.a
Normal file
Binary file not shown.
BIN
release/mac/Release/libjsoncpp.a
Normal file
BIN
release/mac/Release/libjsoncpp.a
Normal file
Binary file not shown.
BIN
release/mac/Release/libmov.a
Normal file
BIN
release/mac/Release/libmov.a
Normal file
Binary file not shown.
BIN
release/mac/Release/libmp4v2.2.dylib
Normal file
BIN
release/mac/Release/libmp4v2.2.dylib
Normal file
Binary file not shown.
BIN
release/mac/Release/libmpeg.a
Normal file
BIN
release/mac/Release/libmpeg.a
Normal file
Binary file not shown.
BIN
release/mac/Release/libmysqlclient.21.dylib
Normal file
BIN
release/mac/Release/libmysqlclient.21.dylib
Normal file
Binary file not shown.
BIN
release/mac/Release/libssl.1.0.0.dylib
Normal file
BIN
release/mac/Release/libssl.1.0.0.dylib
Normal file
Binary file not shown.
BIN
release/mac/Release/libx264.155.dylib
Normal file
BIN
release/mac/Release/libx264.155.dylib
Normal file
Binary file not shown.
BIN
release/mac/Release/libzlmediakit.a
Normal file
BIN
release/mac/Release/libzlmediakit.a
Normal file
Binary file not shown.
BIN
release/mac/Release/libzltoolkit.a
Normal file
BIN
release/mac/Release/libzltoolkit.a
Normal file
Binary file not shown.
6
release/mac/Release/readme.md
Normal file
6
release/mac/Release/readme.md
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
执行可执行程序时,请在终端输入:
|
||||||
|
|
||||||
|
```
|
||||||
|
export DYLD_LIBRARY_PATH=./
|
||||||
|
./MediaServer -d &
|
||||||
|
```
|
BIN
release/mac/Release/ssl.p12
Normal file
BIN
release/mac/Release/ssl.p12
Normal file
Binary file not shown.
BIN
release/mac/Release/test_benchmark
Executable file
BIN
release/mac/Release/test_benchmark
Executable file
Binary file not shown.
BIN
release/mac/Release/test_httpApi
Executable file
BIN
release/mac/Release/test_httpApi
Executable file
Binary file not shown.
BIN
release/mac/Release/test_httpClient
Executable file
BIN
release/mac/Release/test_httpClient
Executable file
Binary file not shown.
BIN
release/mac/Release/test_player
Executable file
BIN
release/mac/Release/test_player
Executable file
Binary file not shown.
BIN
release/mac/Release/test_pusher
Executable file
BIN
release/mac/Release/test_pusher
Executable file
Binary file not shown.
BIN
release/mac/Release/test_pusherMp4
Executable file
BIN
release/mac/Release/test_pusherMp4
Executable file
Binary file not shown.
BIN
release/mac/Release/test_server
Executable file
BIN
release/mac/Release/test_server
Executable file
Binary file not shown.
@ -440,6 +440,7 @@ static inline unsigned int showBitsLong(void *pvHandle, int iN)
|
|||||||
if (iN <= 32) {
|
if (iN <= 32) {
|
||||||
return showBits(ptPtr, iN);
|
return showBits(ptPtr, iN);
|
||||||
}
|
}
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user