Mercurial > mxe-octave
view src/of-fits-1-fixes.patch @ 3429:6cf5d50556d4
* tools/set-mxe-env.sh.in: Rename from tools/set_mxe_env.sh.in.
* configure.ac: Update.
* Makefile.in (clean): Delete generated tools/set-mxe-env.sh.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 16 Jan 2014 14:07:22 -0500 |
parents | 3d24cec05900 |
children |
line wrap: on
line source
diff -ur fits.orig/src/Makefile fits/src/Makefile --- fits.orig/src/Makefile 2014-01-12 00:19:31.000000000 -0500 +++ fits/src/Makefile 2014-01-12 00:52:57.000000000 -0500 @@ -1,4 +1,4 @@ -MKOCT_FLAGS = $(shell pkg-config --libs cfitsio) +MKOCT_FLAGS = $(shell pkg-config --libs --cflags cfitsio) all: read_fits_image.oct save_fits_image.oct save_fits_image_multi_ext.oct diff -ur fits.orig/src/read_fits_image.cc fits/src/read_fits_image.cc --- fits.orig/src/read_fits_image.cc 2014-01-12 00:19:31.000000000 -0500 +++ fits/src/read_fits_image.cc 2014-01-12 00:51:26.000000000 -0500 @@ -136,7 +136,7 @@ } //std::cerr << "read_sz: " << read_sz << std::endl; - #if OCTAVE_API_VERSION_NUMBER >= 45 + #if ! defined OCTAVE_API_VERSION_NUMBER || OCTAVE_API_VERSION_NUMBER >= 45 MArray<double> image_data( dims ); // a octace double-type array #else MArrayN<double> image_data( dims ); // a octave double-type array