Use downloaded include if available

Author: cboulay

README.md

@@ -27,7 +27,7 @@ Instead, you can download the source, the dependencies, and build yourself. This
 
 ## How to Use
 
-1. Add this folder to your MATLAB path recursively
+1. Add the liblsl-Matlab folder to your MATLAB path recursively
     * Using the MATLAB GUI, use File/Set Path...
     * Alternatively, in a script, use `addpath(genpath('path/to/liblsl-Matlab'));`
 2. Load the library then call a function.

build_mex.m

@@ -2,8 +2,17 @@
 % For Octave on Linux, you need the package liboctave-dev installed
 % You also need the liblsl64 binary in the bin folder and a configured
 % C compiler (mex -setup)
-libs = {};
+
+orig_path = pwd();  % Will change back to this when done.
+ext = ['.' mexext];
+script_dir = fileparts(mfilename('fullpath'));
+files = dir('mex/*.c');
+
+% Find liblsl, possibly downloading it if it can't be found locally.
 lsl_fname = lsl_get_dll();
+
+% Build cell array of libray dependencies (liblsl and maybe others)
+libs = {};
 if contains(lsl_fname, '32')
     libs{end+1} = '-llsl32';
 elseif contains(lsl_fname, '64')
@@ -15,25 +24,29 @@
     libs{end+1} = '-ldl';
 end
 
-ext = ['.' mexext];
-
-files = dir('mex/*.c');
+% Find liblsl headers. If liblsl was downloaded above then check there.
+%  Otherwise assume they are in a sister directory.
+if exist(fullfile(script_dir, 'bin', 'liblsl_archive', 'include'), 'dir')
+    incl_dir = fullfile(script_dir, 'bin', 'liblsl_archive', 'include');
+else
+    incl_dir = fullfile(script_dir, '..', 'liblsl', 'include');
+end
 
-orig_path = pwd();
 disp('Building mex files. This may take a few minutes.');
-binarypath = fullfile(fileparts(mfilename('fullpath')), 'bin');
+binarypath = fullfile(script_dir, 'bin');
 cd(binarypath);
 for i = 1:length(files)
     f = files(i);
 	[~, base, ~] = fileparts(f.name);
 	targetstats = dir([base, ext]);
 	if isempty(targetstats) || f.datenum > targetstats.datenum
-		mex('-I../../liblsl/include','-L.', libs{:}, ['../mex/', f.name]);
+		mex(['-I', incl_dir], '-L.', libs{:}, ['../mex/', f.name]);
 	else
 		disp([base, ext, ' up to date']);
 	end
 end
 if ismac
     system('install_name_tool -add_rpath "@loader_path/" lsl_loadlib_.mexmaci64')
 end
+
 cd(orig_path);

lsl_get_dll.m

@@ -63,16 +63,12 @@
     LIBLSL_TAG = 'v1.14.0';
     LIBLSL_VER = '1.14.0';
     liblsl_url = ['https://github.com/sccn/liblsl/releases/download/' LIBLSL_TAG '/'];
-    if ispc
-        if strcmpi(bitness, '64')
-            arch_suffix = '_amd64';
-        else
-            arch_suffix = '_i386';
-        end
-        liblsl_url_fname = ['liblsl-' LIBLSL_VER '-Win' arch_suffix '.zip'];
+    if ispc && contains(computer,'64')
+        liblsl_url_fname = ['liblsl-' LIBLSL_VER '-Win_amd64.zip'];
+    elseif ispc
+        liblsl_url_fname = ['liblsl-' LIBLSL_VER '-Win_i386.zip'];
     elseif ismac
         liblsl_url_fname = ['liblsl-' LIBLSL_VER '-OSX_amd64.tar.bz2'];
-        
     elseif isunix
         liblsl_url_fname = ['liblsl-' LIBLSL_VER '-focal_amd64.deb'];
     end