Mercurial > mxe-octave
view src/of-tisean-1-fixes.patch @ 4055:ccade212c3f9
ghostscript: set ghostscript search paths based on mxe install path (Bug #46301)
* src/ghostscript-mingw-i686-makefile: update GS_LIB_DEFAULT, GS_DOC_DIR paths
* src/ghostscript-mingw-x86_64-makefile: update GS_LIB_DEFAULT, GS_DOC_DIR paths
* src/ghostscript.mk: use ENABLE_WINDOWS_64 flag to set whether to compile mingw 32 or 64
author | John Donoghue |
---|---|
date | Mon, 02 Nov 2015 17:30:00 -0500 |
parents | 2477e9d2f43e |
children |
line wrap: on
line source
diff -ur tisean-0.2.3.orig/src/Makefile.in tisean-0.2.3/src/Makefile.in --- tisean-0.2.3.orig/src/Makefile.in 2015-08-24 13:01:27.265995455 -0400 +++ tisean-0.2.3/src/Makefile.in 2015-09-03 12:59:29.934122317 -0400 @@ -1,9 +1,18 @@ MKOCTFILE ?= mkoctfile -Wall +OCTAVE_CONFIG ?= octave-config SED ?= sed LIBS_F=source_f/libsla.a CXXFLAGS=@CXXFLAGS@ FFLAGS=@AM_FFLAGS@ @FFLAGS@ +CANONICAL_HOST_TYPE=$(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE) +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE))) + F77LIBS := $(shell $(MKOCTFILE) -p FLIBS) +endif +ifneq (,$(findstring cygwin,$(CANONICAL_HOST_TYPE))) + F77LIBS := $(shell $(MKOCTFILE) -p FLIBS) +endif + ## The next two are important to actually rebuild them when a change ## is made to the the functions they link to. OCT_LINK_F=__surrogates__.oct __c1__.oct __upo__.oct lazy.oct @@ -73,7 +82,7 @@ $(MKOCTFILE) $(CXXFLAGS) $< $(LIBS) -o $@ $(OCT_LINK_F): %.oct : %.cc $(OBJECTS_F) $(LIBS_F) - $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) -o $@ + $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) $(F77LIBS) -o $@ $(OCT_LINK_CC): %.oct : %.cc $(OBJECTS_CC) $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_CC) -o $@