Commit 9dbfaae3 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Generic patch handling.

parent efbab75f
......@@ -43,12 +43,12 @@ set(EP_ffmpeg_CONFIGURE_OPTIONS
"--disable-vdpau"
)
set(EP_ffmpeg_LINKING_TYPE "--disable-static" "--enable-shared")
set(EP_ffmpeg_PATCH_COMMAND "patch" "-p1" "<" "${CMAKE_CURRENT_SOURCE_DIR}/builders/ffmpeg/no-sdl.patch")
set(EP_ffmpeg_PATCH_COMMAND "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/ffmpeg/no-sdl.patch")
set(EP_ffmpeg_ARCH "i386")
if(APPLE)
set(EP_ffmpeg_TARGET_OS "darwin")
set(EP_ffmpeg_PATCH_COMMAND ${EP_ffmpeg_PATCH_COMMAND} "COMMAND" "patch" "-p1" "<" "${CMAKE_CURRENT_SOURCE_DIR}/builders/ffmpeg/configure-osx.patch")
set(EP_ffmpeg_PATCH_COMMAND ${EP_ffmpeg_PATCH_COMMAND} "COMMAND" "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/ffmpeg/configure-osx.patch")
else(APPLE)
set(EP_ffmpeg_TARGET_OS "linux")
endif(APPLE)
......
......@@ -43,6 +43,16 @@ if(MSVC)
endif(NOT SH_PROGRAM)
endif(MSVC)
find_program(PATCH_PROGRAM
NAMES patch patch.exe
)
if(NOT PATCH_PROGRAM)
if(WIN32)
message(FATAL_ERROR "Could not find the patch.exe program. Please install it from http://gnuwin32.sourceforge.net/packages/patch.htm")
else(WIN32)
message(FATAL_ERROR "Could not find the patch program.")
endif(WIN32)
endif(NOT PATCH_PROGRAM)
set(LINPHONE_BUILDER_EP_VARS)
......
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