Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6148 → Rev 6149

/contrib/sdk/sources/Makefile
74,20 → 74,30
 
#####################################
 
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,17 → 145,7
 
#####################################
 
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
 
$(LIB_DIR)/libsound.a :