Skip to content

Commit dfd4bc0

Browse files
committed
Fix linux compilation
1 parent e5cb6b7 commit dfd4bc0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build_mex.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
% You also need the liblsl64 binary in the bin folder and a configured
44
% C compiler (mex -setup)
55

6-
libs = '-llsl64';
6+
libs = {'-llsl64'};
77
if ispc
88
dllext = 'dll';
99
elseif ismac
1010
dllext = 'dylib';
1111
elseif isunix
1212
dllext = 'so';
13-
libs = ['-llsl64 -ldl'];
13+
libs = {'-llsl64','-ldl'};
1414
end
1515

1616

@@ -27,7 +27,7 @@
2727
[~, base, ~] = fileparts(f.name);
2828
targetstats = dir([base, ext]);
2929
if isempty(targetstats) || f.datenum > targetstats.datenum
30-
mex('-I../../liblsl/include','-L.', libs, ['../mex/', f.name]);
30+
mex('-I../../liblsl/include','-L.', libs{:}, ['../mex/', f.name]);
3131
else
3232
disp([base, ext, ' up to date']);
3333
end

mex/lsl_loadlib_.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray*prhs[]) {
118118
lsl_remove_child_t lsl_remove_child;
119119

120120
/* the same as list of strings... */
121-
char *fieldnames[] = {"hlib","lsl_protocol_version", "lsl_library_version", "lsl_local_clock", "lsl_resolve_all", "lsl_resolve_byprop", "lsl_resolve_bypred", "lsl_create_streaminfo", "lsl_destroy_streaminfo",
121+
const char *fieldnames[] = {"hlib","lsl_protocol_version", "lsl_library_version", "lsl_local_clock", "lsl_resolve_all", "lsl_resolve_byprop", "lsl_resolve_bypred", "lsl_create_streaminfo", "lsl_destroy_streaminfo",
122122
"lsl_get_name", "lsl_get_type", "lsl_get_channel_count", "lsl_get_nominal_srate", "lsl_get_channel_format", "lsl_get_source_id", "lsl_get_version", "lsl_get_created_at",
123123
"lsl_get_uid", "lsl_get_session_id", "lsl_get_hostname", "lsl_get_desc", "lsl_get_xml", "lsl_create_outlet", "lsl_destroy_outlet", "lsl_push_sample_f", "lsl_push_sample_ft", "lsl_push_sample_ftp",
124124
"lsl_push_sample_d", "lsl_push_sample_dt" , "lsl_push_sample_dtp", "lsl_push_sample_l", "lsl_push_sample_lt", "lsl_push_sample_ltp", "lsl_push_sample_i", "lsl_push_sample_it",

0 commit comments

Comments
 (0)