Mercurial > mxe-octave
diff src/of-sockets-1-fixes.patch @ 3389:4c7ad30fe8a9
of-sockets: update winsock patch
* dist-files.mk: change name from mingw-of-sockets-1-winsock.patch to of-sockets-1-fixes.patch.
* src/of-sockets-1-fixes.patch: moved mingw-of-sockets-1-winsock.patch to of-sockets-1-fixes.patch.
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Fri, 03 Jan 2014 09:38:32 -0500 |
| parents | src/mingw-of-sockets-1-winsock.patch@311f0d70597b |
| children |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-sockets-1-fixes.patch Fri Jan 03 09:38:32 2014 -0500 @@ -0,0 +1,24 @@ +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