Mercurial > mxe-octave
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 3388:58b5ed5a0247 | 3389:4c7ad30fe8a9 |
|---|---|
| 1 diff -ur sockets.orig/src/Makefile sockets/src/Makefile | |
| 2 --- sockets.orig/src/Makefile 2014-01-03 08:34:47.000000000 -0500 | |
| 3 +++ sockets/src/Makefile 2014-01-03 09:18:19.000000000 -0500 | |
| 4 @@ -1,6 +1,11 @@ | |
| 5 OCT = sockets.oct | |
| 6 SRC := $(OCT:.oct=.cc) | |
| 7 | |
| 8 +EXTRALIBS = | |
| 9 +ifeq ($(OS),Windows_NT) | |
| 10 + EXTRALIBS = -lws2_32 | |
| 11 +endif | |
| 12 + | |
| 13 #See which octave version we run by querying mkoctfile for its version | |
| 14 #string. (Is there a better way to do this? This looks horrible.) | |
| 15 majorversion := $(shell mkoctfile --version 2>&1 | sed -e 's/[ .+]/\n/g' |sed -n '3p') | |
| 16 @@ -14,7 +19,7 @@ | |
| 17 all: $(OCT) | |
| 18 | |
| 19 %.oct: %.cc | |
| 20 - mkoctfile $(VFLAGS) -s $< | |
| 21 + mkoctfile $(VFLAGS) -s $< $(EXTRALIBS) | |
| 22 | |
| 23 test: $(OCT) | |
| 24 test_octave_sockets |