Mercurial > mxe-octave
view src/of-sockets-1-cross-fixes.patch @ 4029:c4a341e3e014
ffmpeg: updates to work in windows
* src/ffmpeg.mk: add --extra-libs='-mconsole'
* src/libvpx.mk: set as to yasm
* src/x264-1-fix-bin-bash.patch: update vpx patch from mxe.cc
* src/x264.mk: update version,checksum for 20141130-2245
* src/xvidcore.mk: dont rename xvidcore.dll to libxvidecore.dll
author | John Donoghue |
---|---|
date | Fri, 18 Sep 2015 08:05:55 -0400 |
parents | 9ceedf18871e |
children |
line wrap: on
line source
diff -ur octave-sockets-1.2.0.orig/src/Makefile octave-sockets-1.2.0/src/Makefile --- octave-sockets-1.2.0.orig/src/Makefile 2015-03-20 10:24:40.824141293 -0400 +++ octave-sockets-1.2.0/src/Makefile 2015-03-20 11:31:54.325799984 -0400 @@ -8,12 +8,15 @@ SRC := $(OCT:.oct=.cc) MKOCTFILE ?= mkoctfile -Wall +OCTAVE_CONFIG ?= octave-config OCTAVE ?= octave +CANONICAL_HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)) + #The following is necessary to get the sockets package working in Windows. #It has been tried on Win7 and XP, in Octave 3.8.0 using mxe-octave (mingw) EXTRALIBS := -ifeq ($(OS),Windows_NT) +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE))) EXTRALIBS := -lws2_32 endif