Commit 1c6b323f authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Do not build opus statically for webplugin on Windows for the moment.

parent c176a14d
......@@ -24,7 +24,7 @@ set(EP_ms2_GIT_REPOSITORY "git://git.linphone.org/mediastreamer2.git")
if(${LINPHONE_BUILDER_LATEST})
set(EP_ms2_GIT_TAG "master")
else()
set(EP_ms2_GIT_TAG "1757cfddfc6762462e526f6c7f9464765f5e78fb")
set(EP_ms2_GIT_TAG "1e6d4d2e2c84ae731e2a1c659afd97d333ff61bb")
endif()
if(MSVC)
......
......@@ -20,4 +20,4 @@
#
############################################################################
execute_process(COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${INSTALL_PREFIX}/lib/libopus.a" "${INSTALL_PREFIX}/lib/opus.lib")
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "${SOURCE_DIR}/cmake/importlib.py" "${INSTALL_PREFIX}/bin/libopus-0.dll" "${INSTALL_PREFIX}/lib/opus.lib")
......@@ -95,7 +95,10 @@ list(APPEND EP_ms2_CONFIGURE_OPTIONS
)
# opus
set(EP_opus_LINKING_TYPE "--enable-static" "--disable-shared" "--with-pic")
if(NOT MSVC)
# TODO: Also build statically on windows
set(EP_opus_LINKING_TYPE "--enable-static" "--disable-shared" "--with-pic")
endif()
# v4l
set(EP_v4l_LINKING_TYPE "--enable-static" "--disable-shared" "--with-pic")
......
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