Mercurial > mxe-octave
view src/of-sockets-1-cross-fixes.patch @ 4026:28fa86d2cf21
ffmpeg: mods for native linux build of ffmpeg
* src/ffmpeg.mk: add native build rule
* src/libvpx-1-fixes.patch: update patch from mxe.cc
* src/libvpx.mk: update to version 1.4.0, add native build rule
* src/sdl-1-xdata.patch" new patch file
* src/sdl.mk: add native build rule
* src/xvidcore.mk: add native build rule
author | John D |
---|---|
date | Sat, 12 Sep 2015 20:35:11 -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