[vlfeat] 28/44: Makefile.mak: default to MATLAB R2014b

Dima Kogan dima at secretsauce.net
Wed Sep 16 21:05:31 UTC 2015


This is an automated email from the git hooks/post-receive script.

dkogan-guest pushed a commit to branch master
in repository vlfeat.

commit 570ad5513aff4739edddd5c6dab7c519877933f0
Author: Andrea Vedaldi <vedaldi at gmail.com>
Date:   Wed Jan 14 12:16:12 2015 -0800

    Makefile.mak: default to MATLAB R2014b
---
 Makefile.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.mak b/Makefile.mak
index 74b3c56..80310c1 100644
--- a/Makefile.mak
+++ b/Makefile.mak
@@ -47,7 +47,7 @@ WINSDKROOT = C:\Program Files\Microsoft SDKs\Windows\v7.0A
 !if "$(ARCH)" == "win32"
 !message === COMPILING FOR 32-BIT
 
-MATLABROOT = C:\Program Files (x86)\MATLAB\R2009b
+MATLABROOT = C:\Program Files (x86)\MATLAB\R2014b
 MEX = "$(MATLABROOT)\bin\mex.bat"
 MEXOPT = "$(MATLABROOT)\bin\win32\mexopts\msvc$(MSVSVER)opts.bat"
 MEXEXT = mexw32
@@ -65,7 +65,7 @@ LFLAGS = /MACHINE:X86 \
 !elseif "$(ARCH)" == "win64"
 !message === COMPILING FOR 64-BIT
 
-MATLABROOT = C:\Program Files\MATLAB\R2009b
+MATLABROOT = C:\Program Files\MATLAB\R2014b
 MEX = "$(MATLABROOT)\bin\mex.bat"
 MEXOPT = "$(MATLABROOT)\bin\win64\mexopts\msvc$(MSVSVER)opts.bat"
 MEXEXT = mexw64

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vlfeat.git



More information about the debian-science-commits mailing list