Mercurial > mxe-octave
view src/of-nan-1-cross-fixes.patch @ 4090:d6f9b54851b5
l: update to v1.11.4
* src/gdal.mk: update version, checksum, install gdal.pc file
author | John Donoghue |
---|---|
date | Mon, 08 Feb 2016 12:53:00 -0500 |
parents | 9f7e9b053041 |
children | 6c7d570cd9ff |
line wrap: on
line source
diff -ur NaN.orig/src/Makefile NaN/src/Makefile --- NaN.orig/src/Makefile 2015-06-30 13:30:25.348544831 -0400 +++ NaN/src/Makefile 2015-06-30 13:35:18.600346663 -0400 @@ -31,13 +31,15 @@ # Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin; #################################################### MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION) -CC = gcc -CXX = g++ +OCTAVE_CONFIG ?= octave-config +CC = $(shell $(MKOCTFILE) -p CC) +CXX = $(shell $(MKOCTFILE) -p CXX) CFLAGS = -fopenmp -Wall -Wextra -Wconversion -O2 OCTMEX = $(MKOCTFILE) --mex RM = rm -ifneq ($(OS),Windows_NT) +HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)) +ifeq (,$(findstring mingw,$(HOST_TYPE))) CFLAGS += -fPIC endif