Mercurial > mxe-octave

view src/of-sockets-1-cross-fixes.patch @ 4658:213da5688be0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update binary dist rules * binary-dist-rules.mk: Use -w64, -w32, or -w64-64 suffix for Windows binary distributions. New target for creating .7z files. * tools/makeinst-script.sh.in: New arg for name of installer file.
author John W. Eaton <jwe@octave.org>
date Thu, 12 Apr 2018 12:09:22 -0400
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