Commit 12ecf664 authored by Ghislain MARY's avatar Ghislain MARY

Some fixes for build of webplugin on Windows.

parent 5027e4be
......@@ -20,4 +20,4 @@
#
############################################################################
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "${SOURCE_DIR}/cmake/importlib.py" "${INSTALL_PREFIX}/bin/libvpx-1.dll" "${INSTALL_PREFIX}/lib/vpx.lib")
execute_process(COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${INSTALL_PREFIX}/lib/libvpx.a" "${INSTALL_PREFIX}/lib/vpx.lib")
......@@ -20,4 +20,4 @@
#
############################################################################
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "${SOURCE_DIR}/cmake/importlib.py" "${INSTALL_PREFIX}/bin/libxml2-2.dll" "${INSTALL_PREFIX}/lib/xml2.lib")
execute_process(COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${INSTALL_PREFIX}/lib/libxml2.a" "${INSTALL_PREFIX}/lib/xml2.lib")
......@@ -346,6 +346,12 @@ function(linphone_builder_add_project PROJNAME)
# Build in source with MinGW as build out-of-source does not work
set(ep_build ${ep_source})
set(ep_redirect_to_file "2>&1 >> ${CMAKE_CURRENT_BINARY_DIR}/EP_${PROJNAME}.log")
if(NOT "${ep_autogen_command}" STREQUAL "")
set(ep_autogen_redirect_to_file ${ep_redirect_to_file})
endif()
if(NOT "${ep_configure_command}" STREQUAL "")
set(ep_configure_redirect_to_file ${ep_redirect_to_file})
endif()
else()
set(SCRIPT_EXTENSION sh)
endif()
......
......@@ -24,6 +24,6 @@ cd @ep_build@
if [ ! -f @ep_config_h_file@ ]
then
@ep_autogen_command@ @ep_redirect_to_file@
@ep_configure_env@ @ep_configure_command@ @ep_redirect_to_file@
@ep_autogen_command@ @ep_autogen_redirect_to_file@
@ep_configure_env@ @ep_configure_command@ @ep_configure_redirect_to_file@
fi
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