Mercurial > mxe-octave
annotate 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 |
rev | line source |
---|---|
3381
311f0d70597b
Add octave forge sockets package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
1 diff -ur sockets.orig/src/Makefile sockets/src/Makefile |
3389
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
2 --- sockets.orig/src/Makefile 2014-01-03 08:34:47.000000000 -0500 |
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
3 +++ sockets/src/Makefile 2014-01-03 09:18:19.000000000 -0500 |
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
4 @@ -1,6 +1,11 @@ |
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
5 OCT = sockets.oct |
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
6 SRC := $(OCT:.oct=.cc) |
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
7 |
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
8 +EXTRALIBS = |
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
9 +ifeq ($(OS),Windows_NT) |
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
10 + EXTRALIBS = -lws2_32 |
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
11 +endif |
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
12 + |
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
13 #See which octave version we run by querying mkoctfile for its version |
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
14 #string. (Is there a better way to do this? This looks horrible.) |
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
15 majorversion := $(shell mkoctfile --version 2>&1 | sed -e 's/[ .+]/\n/g' |sed -n '3p') |
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
16 @@ -14,7 +19,7 @@ |
3381
311f0d70597b
Add octave forge sockets package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
17 all: $(OCT) |
311f0d70597b
Add octave forge sockets package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
18 |
311f0d70597b
Add octave forge sockets package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
19 %.oct: %.cc |
311f0d70597b
Add octave forge sockets package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
20 - mkoctfile $(VFLAGS) -s $< |
3389
4c7ad30fe8a9
of-sockets: update winsock patch
John Donoghue <john.donoghue@ieee.org>
parents:
3381
diff
changeset
|
21 + mkoctfile $(VFLAGS) -s $< $(EXTRALIBS) |
3381
311f0d70597b
Add octave forge sockets package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
22 |
311f0d70597b
Add octave forge sockets package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
23 test: $(OCT) |
311f0d70597b
Add octave forge sockets package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
24 test_octave_sockets |