Mercurial > mxe-octave
comparison src/of-nan-1-cross-fixes.patch @ 3980:9f7e9b053041
of-nan: add Nan 2.8.0 package
* Makefile.in: add of-nan to OCTAVE_FORGE_PACKAGES
* build_packages.m: add nan-2.8.0 install
* dist-files.mk: add of-nan-1-cross-fixes.patch, of-nan.m
* index.html: add of-nan package
* of-nan.mk: new file
* of-nan-1-cross-fixes.patch: new file
| author | John Donoghue |
|---|---|
| date | Tue, 30 Jun 2015 13:41:41 -0400 |
| parents | |
| children | 6c7d570cd9ff |
comparison
equal
deleted
inserted
replaced
| 3979:246d007d1b42 | 3980:9f7e9b053041 |
|---|---|
| 1 diff -ur NaN.orig/src/Makefile NaN/src/Makefile | |
| 2 --- NaN.orig/src/Makefile 2015-06-30 13:30:25.348544831 -0400 | |
| 3 +++ NaN/src/Makefile 2015-06-30 13:35:18.600346663 -0400 | |
| 4 @@ -31,13 +31,15 @@ | |
| 5 # Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin; | |
| 6 #################################################### | |
| 7 MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION) | |
| 8 -CC = gcc | |
| 9 -CXX = g++ | |
| 10 +OCTAVE_CONFIG ?= octave-config | |
| 11 +CC = $(shell $(MKOCTFILE) -p CC) | |
| 12 +CXX = $(shell $(MKOCTFILE) -p CXX) | |
| 13 CFLAGS = -fopenmp -Wall -Wextra -Wconversion -O2 | |
| 14 OCTMEX = $(MKOCTFILE) --mex | |
| 15 RM = rm | |
| 16 | |
| 17 -ifneq ($(OS),Windows_NT) | |
| 18 +HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)) | |
| 19 +ifeq (,$(findstring mingw,$(HOST_TYPE))) | |
| 20 CFLAGS += -fPIC | |
| 21 endif | |
| 22 |