Mercurial > mxe-octave
view src/of-fits-1-cross-fixes.patch @ 4222:44b1a9b2193e
qt5: add initial qt5 to mxe-octave, based on mxe.cc
* src/qt5.mk: new file
* src/qtbase-1-fixes.patch: new file
* src/qtbase.mk: new file
* src/qtimageformats-1.patch: new file
* src/qtimageformats.mk: new file
* src/qtsvg.mk: new file
* src/qttools-1.patch: new file
* added src/qttools.mk: new file
* changed Makefile.in: added ENABLE_QT5 option
* configure.ac: added enable-qt5 option
* index.html: added new files to packages
* installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path
* installer-files/octave.vbs: added setup of qt5 bin, plugin path
* installer-files/octave.bat: added setup of qt5 bin path
* src/default-octave.mk: added settig fot qt5 usage
* src/qscintilla.mk: added qt5 path
author | John D |
---|---|
date | Thu, 29 Sep 2016 11:22:51 -0400 |
parents | 414c464563c6 |
children | 97ad836259c3 |
line wrap: on
line source
diff -ur fits-1.0.7.orig/src/Makefile fits-1.0.7/src/Makefile --- fits-1.0.7.orig/src/Makefile 2016-02-25 13:08:47.394452025 -0500 +++ fits-1.0.7/src/Makefile 2016-02-25 13:10:40.437730825 -0500 @@ -1,4 +1,6 @@ -MKOCT_FLAGS = $(shell pkg-config --libs cfitsio --cflags cfitsio) +MKOCTFILE ?= mkoctfile +PKG_CONFIG ?= pkg-config +MKOCT_FLAGS = $(shell $(PKG_CONFIG) --libs cfitsio --cflags 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) $<