diff --git a/3rdpart/media-server b/3rdpart/media-server index 358b7bd3..4325386b 160000 --- a/3rdpart/media-server +++ b/3rdpart/media-server @@ -1 +1 @@ -Subproject commit 358b7bd3bf89564371fed48797ad396882f9d130 +Subproject commit 4325386be318889b7815cdd86a2e83f05a059c81 diff --git a/CMakeLists.txt b/CMakeLists.txt index c72217d6..6d20b60d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,7 +168,7 @@ if (NOT WIN32) list(REMOVE_ITEM ToolKit_src_list ${ToolKit_Root}/win32/getopt.c) else() #防止Windows.h包含Winsock.h - add_definitions(-DWIN32_LEAN_AND_MEAN -DMP4V2_NO_STDINT_DEFS) + add_definitions(-DWIN32_LEAN_AND_MEAN -DMP4V2_NO_STDINT_DEFS -DOS_WINDOWS) endif () #添加库