Mercurial > mxe-octave
view src/of-sockets-1-fixes.patch @ 3423:c8e055d83b9f
Set start directory to user home (Bug #41220)
* makeinst-script.sh: set outpath to USERPROFILE, use octave-gui and octave-cli for shortcuts, install qt.conf to bin folder.
* src/octave.mk: copy libexec/octave-gui.exe to bin folder.
* src/stable-octave.mk: copy libexec/octave-gui.exe to bin folder.
author | John D <john.donoghue@ieee.org> |
---|---|
date | Tue, 14 Jan 2014 21:30:29 +0000 |
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