Mercurial > mxe-octave
view src/of-fits-1-cross-fixes.patch @ 4608:dac40a0ff814
nsis: update for 64bit compile
* src/nsis.mk: use sed to change default target stype in makensis, set target options to amd64 in 64bit mode, dont skip system plugin
* tools/makeinst-script.sh.in: include MUI2.nsh
author | John Donoghue |
---|---|
date | Wed, 28 Feb 2018 11:01:19 -0500 |
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) $<