Mercurial > mxe-octave

view src/of-sockets-1-fixes.patch @ 3396:91a98aeb816f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add octave forge fuzzy-logic-toolkit package * Makefile.am: add fuzzy-logic-toolkit to OCTAVE_FORGE_PACKAGES. * build_packages.m: add fuzzy-logic-toolkit package to install. * dist-files.mk: add of-fuzzy-logic-toolkit.mk. * index.html: add of-fuzzy-logic-toolkit-package. * src/fuzzy-logic-toolkit.mk: New file
author John Donoghue <john.donoghue@ieee.org>
date Fri, 03 Jan 2014 18:24:34 -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