Commit 4377a72f authored by Stéphane Adjemian's avatar Stéphane Adjemian
Browse files

Fixed binary selection for x13.

isunix returns true for linux AND osx => First test if the patlaform
is osx (with ismac).
parent 5bfe4699
......@@ -18,7 +18,14 @@ function x13_binary = select_x13_binary()
dseries_src_root = strrep(which('initialize_dseries_toolbox'),'initialize_dseries_toolbox.m','');
dseries_x13_root = sprintf('%s%s%s%s%s%s%s', dseries_src_root, '..', filesep(), 'externals', filesep(), 'x13', filesep());
if isunix()
if ismac()
x13_binary = sprintf('%s%s%s', dseries_x13_root, 'osx', filesep());
if is64bit()
x13_binary = sprintf('%s%s%s%s', x13_binary, '64', filesep(), 'x13');
else
x13_binary = sprintf('%s%s%s%s', x13_binary, '32', filesep(), 'x13');
end
elseif isunix()
x13_binary = sprintf('%s%s%s', dseries_x13_root, 'linux', filesep());
if is64bit()
x13_binary = sprintf('%s%s%s%s', x13_binary, '64', filesep(), 'x13');
......@@ -32,13 +39,6 @@ elseif ispc()
else
x13_binary = sprintf('%s%s%s%s', x13_binary, '32', filesep(), 'x13.exe');
end
elseif ismac()
x13_binary = sprintf('%s%s%s', dseries_x13_root, 'osx', filesep());
if is64bit()
x13_binary = sprintf('%s%s%s%s', x13_binary, '64', filesep(), 'x13');
else
x13_binary = sprintf('%s%s%s%s', x13_binary, '32', filesep(), 'x13');
end
else
error('X13 binary is not yet available for this plateform')
end
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment