Mercurial > mxe-octave
view src/of-tsa-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 | 1368ac3ea124 |
children | c970bbc5e7db |
line wrap: on
line source
diff -ur tsa.orig/src/Makefile tsa/src/Makefile --- tsa.orig/src/Makefile 2015-05-17 20:55:08.000000000 -0400 +++ tsa/src/Makefile 2015-05-17 20:58:48.000000000 -0400 @@ -39,11 +39,12 @@ W32_LIBS += $(LDLIBS_W32)libblas.a W64_LIBS += $(LDLIBS_W64)libblas.a -CC = gcc -CXX = g++ +CC ?= gcc +CXX ?= g++ CFLAGS = -Wall -Wextra -Wconversion -O2 -fPIC -OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex -RM = rm +MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION) +OCTMEX ?= $(MKOCTFILE) --mex +RM ?= rm ifneq (Darwin,$(shell uname)) CFLAGS += -fopenmp @@ -91,7 +92,7 @@ # Octave, MATLAB on Linux ######################################################### %.oct: %.cc - mkoctfile$(OCTAVE_VERSION) "$<" + $(MKOCTFILE) "$<" %.mex: %.cpp $(OCTMEX) "$<" -llapack -lblas