Commit 20afccff authored by DanmeiChen's avatar DanmeiChen

Merge branch 'feature/make_framework_on_macos' into 'master'

make framework on macos

See merge request !1
parents fd330d26 014c952a
...@@ -47,14 +47,19 @@ if(ENABLE_STATIC) ...@@ -47,14 +47,19 @@ if(ENABLE_STATIC)
) )
endif() endif()
if(ENABLE_SHARED) if(ENABLE_SHARED)
if(NOT IOS) if(NOT APPLE)
add_library(msopenh264 MODULE ${SOURCE_FILES}) add_library(msopenh264 MODULE ${SOURCE_FILES})
else() else()
add_library(msopenh264 SHARED ${SOURCE_FILES}) add_library(msopenh264 SHARED ${SOURCE_FILES})
endif() endif()
target_link_libraries(msopenh264 ${LIBS}) target_link_libraries(msopenh264 ${LIBS})
if(IOS) if(APPLE)
set(MIN_OS ${LINPHONE_IOS_DEPLOYMENT_TARGET}) if(IOS)
set(MIN_OS ${LINPHONE_IOS_DEPLOYMENT_TARGET})
else()
set(MIN_OS ${CMAKE_OSX_DEPLOYMENT_TARGET})
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/osx/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/osx/")
set_target_properties(msopenh264 PROPERTIES set_target_properties(msopenh264 PROPERTIES
FRAMEWORK TRUE FRAMEWORK TRUE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment