From b059a659282056c05a1d38f32152f4fc160e059a Mon Sep 17 00:00:00 2001 From: "Sergey Semyonov (Serge)" Date: Fri, 5 Feb 2016 22:15:19 +0000 Subject: [PATCH] sdk: update Makefile git-svn-id: svn://kolibrios.org@6149 a494cfbc-eb01-0410-851d-a64ba20cac60 --- contrib/sdk/sources/Makefile | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/sdk/sources/Makefile b/contrib/sdk/sources/Makefile index b138305d45..0242116b65 100644 --- a/contrib/sdk/sources/Makefile +++ b/contrib/sdk/sources/Makefile @@ -74,20 +74,30 @@ $(LIB_DIR)/libpixlib3.a: newlib libdrm Mesa ##################################### -ffmpeg: $(DLL_DIR)/avcodec-55.dll $(DLL_DIR)/avdevice-55.dll \ - $(DLL_DIR)/avformat-55.dll $(DLL_DIR)/avutil-52.dll \ - $(DLL_DIR)/swresample-0.dll $(DLL_DIR)/swscale-2.dll \ +vaapi: $(DLL_DIR)/i65-video.dll $(DLL_DIR)/libva.dll + +$(DLL_DIR)/i65-video.dll : newlib libdrm + $(MAKE) -C vaapi/intel-driver-1.6.2 + +$(DLL_DIR)/libva.dll : newlib libdrm + $(MAKE) -C vaapi/libva-1.6.2 + +##################################### + +ffmpeg: $(DLL_DIR)/avcodec-56.dll $(DLL_DIR)/avdevice-56.dll \ + $(DLL_DIR)/avformat-56.dll $(DLL_DIR)/avutil-54.dll \ + $(DLL_DIR)/swresample-1.dll $(DLL_DIR)/swscale-3.dll \ $(LIB_DIR)/libavcodec.dll.a $(LIB_DIR)/libavdevice.dll.a \ $(LIB_DIR)/libavformat.dll.a $(LIB_DIR)/libavutil.dll.a \ $(LIB_DIR)/libswresample.dll.a $(LIB_DIR)/libswscale.dll.a -$(DLL_DIR)/avcodec-55.dll $(DLL_DIR)/avdevice-55.dll \ - $(DLL_DIR)/avformat-55.dll $(DLL_DIR)/avutil-52.dll \ - $(DLL_DIR)/swresample-0.dll $(DLL_DIR)/swscale-2.dll \ +$(DLL_DIR)/avcodec-56.dll $(DLL_DIR)/avdevice-56.dll \ + $(DLL_DIR)/avformat-56.dll $(DLL_DIR)/avutil-54.dll \ + $(DLL_DIR)/swresample-1.dll $(DLL_DIR)/swscale-3.dll \ $(LIB_DIR)/libavcodec.dll.a $(LIB_DIR)/libavdevice.dll.a \ $(LIB_DIR)/libavformat.dll.a $(LIB_DIR)/libavutil.dll.a \ - $(LIB_DIR)/libswresample.dll.a $(LIB_DIR)/libswscale.dll.a : newlib - $(MAKE) -C ffmpeg + $(LIB_DIR)/libswresample.dll.a $(LIB_DIR)/libswscale.dll.a : newlib vaapi + $(MAKE) -C ffmpeg/ffmpeg-2.8 ##################################### @@ -135,16 +145,6 @@ $(DLL_DIR)/libeglut.dll $(LIB_DIR)/libeglut.dll.a $(LIB_DIR)/libeglut.a : newlib ##################################### -vaapi: $(DLL_DIR)/i65-video.dll $(DLL_DIR)/libva.dll - -$(DLL_DIR)/i65-video.dll : newlib libdrm - $(MAKE) -C vaapi/intel-driver-1.4.1 - -$(DLL_DIR)/libva.dll : newlib libdrm - $(MAKE) -C vaapi/libva-1.4.1 - -##################################### - sound: $(LIB_DIR)/libsound.a