Mercurial > mxe-octave
view src/of-sockets-1-fixes.patch @ 3453:70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
* binary-dist-rules.mk: copy installer-files/README.html to dist folder.
* installer-files/README.html: New file.
* makeinst-script.sh: Added custom page for Install for all users and Create shortcuts. Reassigned show readme checkbox for showing README.html at end of install. Run octave-gui as the Run program.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sat, 25 Jan 2014 19:24:09 -0500 |
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