diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b44dec2..e71ab398 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,8 +21,8 @@ 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) + SET(LIBRARY_OUTPUT_PATH ${RELEASE_DIR}/windows/${BuildType}) + SET(EXECUTABLE_OUTPUT_PATH ${RELEASE_DIR}/windows/${BuildType}) elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin") SET(LIBRARY_OUTPUT_PATH ${RELEASE_DIR}/mac/${BuildType}) SET(EXECUTABLE_OUTPUT_PATH ${RELEASE_DIR}/mac/${BuildType}) @@ -127,7 +127,7 @@ add_library(zltoolkit STATIC ${ToolKit_src_list}) add_library(zlmediakit STATIC ${MediaKit_src_list}) -set(VS_FALGS "/wd4819 /wd4996 /wd4018 /wd4267 /wd4244 /wd4101 /wd4828 /wd4309 /wd4573 /utf-8" ) +set(VS_FALGS "/wd4819 /wd4996 /wd4018 /wd4267 /wd4244 /wd4101 /wd4828 /wd4309 /wd4573" ) #libmpeg if(ENABLE_HLS) aux_source_directory(${MediaServer_Root}/libmpeg/include src_mpeg) diff --git a/release/windows/Release/MediaServer.exe b/release/windows/Release/MediaServer.exe new file mode 100644 index 00000000..5a034af7 Binary files /dev/null and b/release/windows/Release/MediaServer.exe differ diff --git a/release/windows/Release/libcrypto-1_1.dll b/release/windows/Release/libcrypto-1_1.dll new file mode 100644 index 00000000..a5cf4688 Binary files /dev/null and b/release/windows/Release/libcrypto-1_1.dll differ diff --git a/release/windows/Release/libmysql.dll b/release/windows/Release/libmysql.dll new file mode 100644 index 00000000..4e40ffd2 Binary files /dev/null and b/release/windows/Release/libmysql.dll differ diff --git a/release/windows/Release/libssl-1_1.dll b/release/windows/Release/libssl-1_1.dll new file mode 100644 index 00000000..ef23944d Binary files /dev/null and b/release/windows/Release/libssl-1_1.dll differ diff --git a/release/windows/Release/ssl.p12 b/release/windows/Release/ssl.p12 new file mode 100644 index 00000000..fe42e11f Binary files /dev/null and b/release/windows/Release/ssl.p12 differ diff --git a/release/windows/Release/test_benchmark.exe b/release/windows/Release/test_benchmark.exe new file mode 100644 index 00000000..1eebc1d0 Binary files /dev/null and b/release/windows/Release/test_benchmark.exe differ diff --git a/release/windows/Release/test_httpApi.exe b/release/windows/Release/test_httpApi.exe new file mode 100644 index 00000000..513ea222 Binary files /dev/null and b/release/windows/Release/test_httpApi.exe differ diff --git a/release/windows/Release/test_httpClient.exe b/release/windows/Release/test_httpClient.exe new file mode 100644 index 00000000..91ba52fc Binary files /dev/null and b/release/windows/Release/test_httpClient.exe differ diff --git a/release/windows/Release/test_pusher.exe b/release/windows/Release/test_pusher.exe new file mode 100644 index 00000000..16cf5fa1 Binary files /dev/null and b/release/windows/Release/test_pusher.exe differ diff --git a/release/windows/Release/test_pusherMp4.exe b/release/windows/Release/test_pusherMp4.exe new file mode 100644 index 00000000..56f763c4 Binary files /dev/null and b/release/windows/Release/test_pusherMp4.exe differ diff --git a/release/windows/Release/test_server.exe b/release/windows/Release/test_server.exe new file mode 100644 index 00000000..273a5da7 Binary files /dev/null and b/release/windows/Release/test_server.exe differ diff --git a/src/Rtmp/amf.h b/src/Rtmp/amf.h index 878af604..8463d780 100644 --- a/src/Rtmp/amf.h +++ b/src/Rtmp/amf.h @@ -31,6 +31,7 @@ #include #include #include +#include enum AMFType { AMF_NUMBER, AMF_INTEGER,