diff --git a/meson.build b/meson.build index f5acef473978bda1f50a8e3a80a592e471af532a..f6b2a7c01afd49132ee4b1237b1351b39f568142 100644 --- a/meson.build +++ b/meson.build @@ -199,7 +199,11 @@ else # Octave build octave_incflags = run_command(mkoctfile_exe, '-p', 'INCFLAGS', check : true).stdout().split() octlibdir = run_command(mkoctfile_exe, '-p', 'OCTLIBDIR', check : true).stdout().strip() - octave_libs = run_command(mkoctfile_exe, '-p', 'OCTAVE_LIBS', check : true).stdout().split() + if octave_version.version_compare('<10') + octave_libs = run_command(mkoctfile_exe, '-p', 'OCTAVE_LIBS', check : true).stdout().split() + else + octave_libs = run_command(mkoctfile_exe, '-p', 'LIBOCTMEX', check : true).stdout().split() + endif octave_link_args = [] diff --git a/windows/deps/mkoctfile64 b/windows/deps/mkoctfile64 index e1e8440bdf539b12eb28dc840cedeb7b90bff0d2..a1bb1931a9ad94e621b03afccd1985726edb1823 100755 --- a/windows/deps/mkoctfile64 +++ b/windows/deps/mkoctfile64 @@ -105,6 +105,8 @@ fi : ${OCTAVE_LIBS="$LIBOCTINTERP $LIBOCTAVE $SPECIAL_MATH_LIB"} +: ${LIBOCTMEX="-loctmex"} + # Local variables. FFTW_LIBS="$FFTW3_LDFLAGS $FFTW3_LIBS $FFTW3F_LDFLAGS $FFTW3F_LIBS"