Mercurial > mxe-octave
view src/of-sockets-1-cross-fixes.patch @ 5541:d862fd40cc42
Use ccache for packages built with cmake.
* Makefile.in: New variable CMAKE_CCACHE_FLAGS.
* src/armadillo.mk, src/cgal.mk, src/cmake.mk, src/cminpack,
src/double-conversion.mk, src/eigen.mk, src/gdcm.mk, src/gl2ps.mk,
src/hdf5.mk, src/lapack.mk, src/libical.mk, src/libproxy, src/llvm.mk,
src/of-dicom.mk, src/openal.mk, src/opencv.mk, src/openexr.mk,
src/openscenegraph.mk, src/physfs.mk, src/qhull.mk, src/qjson.mk,
src/rapidjson.mk, src/suitesparse.mk, src/sundials-ida.mk, src/taglib.mk,
src/vigra.mk, src/vmime.mk, src/vtk.mk, src/wt.mk: Add new variable to cmake
flags. Harmonize indentation in files.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sun, 20 Sep 2020 11:57:01 +0200 |
parents | 9ceedf18871e |
children |
line wrap: on
line source
diff -ur octave-sockets-1.2.0.orig/src/Makefile octave-sockets-1.2.0/src/Makefile --- octave-sockets-1.2.0.orig/src/Makefile 2015-03-20 10:24:40.824141293 -0400 +++ octave-sockets-1.2.0/src/Makefile 2015-03-20 11:31:54.325799984 -0400 @@ -8,12 +8,15 @@ SRC := $(OCT:.oct=.cc) MKOCTFILE ?= mkoctfile -Wall +OCTAVE_CONFIG ?= octave-config OCTAVE ?= octave +CANONICAL_HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)) + #The following is necessary to get the sockets package working in Windows. #It has been tried on Win7 and XP, in Octave 3.8.0 using mxe-octave (mingw) EXTRALIBS := -ifeq ($(OS),Windows_NT) +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE))) EXTRALIBS := -lws2_32 endif