Mercurial > mxe-octave

view src/of-sockets-1-fixes.patch @ 3710:1220a9158bc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make building 64-bit Windows binaries independent from enabling 64-bit indexing in Octave
author John W. Eaton <jwe@octave.org>
date Sun, 07 Sep 2014 06:42:40 -0400
parents 4c7ad30fe8a9
children
line wrap: on
line source

diff -ur sockets.orig/src/Makefile sockets/src/Makefile
--- sockets.orig/src/Makefile	2014-01-03 08:34:47.000000000 -0500
+++ sockets/src/Makefile	2014-01-03 09:18:19.000000000 -0500
@@ -1,6 +1,11 @@
 OCT = sockets.oct
 SRC := $(OCT:.oct=.cc)
 
+EXTRALIBS = 
+ifeq ($(OS),Windows_NT)
+  EXTRALIBS = -lws2_32
+endif
+
 #See which octave version we run by querying mkoctfile for its version
 #string. (Is there a better way to do this? This looks horrible.) 
 majorversion := $(shell  mkoctfile --version 2>&1  | sed  -e 's/[ .+]/\n/g' |sed  -n '3p')
@@ -14,7 +19,7 @@
 all: $(OCT)
 
 %.oct: %.cc
-	mkoctfile $(VFLAGS) -s $<
+	mkoctfile $(VFLAGS) -s $< $(EXTRALIBS)
 
 test: $(OCT)
 	test_octave_sockets