Mercurial > mxe-octave
view src/of-fits-1-cross-fixes.patch @ 4026:28fa86d2cf21
ffmpeg: mods for native linux build of ffmpeg
* src/ffmpeg.mk: add native build rule
* src/libvpx-1-fixes.patch: update patch from mxe.cc
* src/libvpx.mk: update to version 1.4.0, add native build rule
* src/sdl-1-xdata.patch" new patch file
* src/sdl.mk: add native build rule
* src/xvidcore.mk: add native build rule
author | John D |
---|---|
date | Sat, 12 Sep 2015 20:35:11 -0400 |
parents | 85568f3159a4 |
children | 414c464563c6 |
line wrap: on
line source
diff -ur fits.orig/src/Makefile fits/src/Makefile --- fits.orig/src/Makefile 2015-03-20 13:37:26.766478760 -0400 +++ fits/src/Makefile 2015-03-20 13:39:14.198586323 -0400 @@ -1,4 +1,6 @@ -MKOCT_FLAGS = $(shell pkg-config --libs cfitsio) +MKOCTFILE ?= mkoctfile +PKG_CONFIG ?= pkg-config +MKOCT_FLAGS = $(shell $(PKG_CONFIG) --libs cfitsio) all: read_fits_image.oct save_fits_image.oct save_fits_image_multi_ext.oct @@ -6,5 +8,5 @@ rm -f *.oct *.o %.oct: %.cc - mkoctfile --verbose -Wall $(MKOCT_FLAGS) $< + $(MKOCTFILE) --verbose -Wall $(MKOCT_FLAGS) $<