Verified Commit 7e1594bb authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

x13 binary has been renamed to x13as

parent 74167124
Pipeline #477 passed with stage
in 1 minute and 43 seconds
...@@ -28,15 +28,15 @@ dseries_src_root = strrep(which('initialize_dseries_toolbox'),'initialize_dserie ...@@ -28,15 +28,15 @@ dseries_src_root = strrep(which('initialize_dseries_toolbox'),'initialize_dserie
% Check that the x13 binary is available % Check that the x13 binary is available
nox13 = false; nox13 = false;
if isunix() if isunix()
if ~(exist([dseries_src_root '../externals/x13/linux/64/x13'], 'file') && exist([dseries_src_root '../externals/x13/linux/32/x13'], 'file')) if ~(exist([dseries_src_root '../externals/x13/linux/64/x13as'], 'file') && exist([dseries_src_root '../externals/x13/linux/32/x13as'], 'file'))
nox13 = true; nox13 = true;
end end
elseif ismac() elseif ismac()
if ~exist([dseries_src_root '../externals/x13/osx/64/x13'], 'file') if ~exist([dseries_src_root '../externals/x13/osx/64/x13as'], 'file')
nox13 = true; nox13 = true;
end end
elseif ispc() elseif ispc()
if ~(exist([dseries_src_root '../externals/x13/windows/64/x13.exe'], 'file') && exist([dseries_src_root '../externals/x13/windows/32/x13.exe'], 'file')) if ~(exist([dseries_src_root '../externals/x13/windows/64/x13as.exe'], 'file') && exist([dseries_src_root '../externals/x13/windows/32/x13as.exe'], 'file'))
nox13 = true; nox13 = true;
end end
else else
......
...@@ -21,23 +21,23 @@ dseries_x13_root = sprintf('%s%s%s%s%s%s%s', dseries_src_root, '..', filesep(), ...@@ -21,23 +21,23 @@ dseries_x13_root = sprintf('%s%s%s%s%s%s%s', dseries_src_root, '..', filesep(),
if ismac() if ismac()
x13_binary = sprintf('%s%s%s', dseries_x13_root, 'osx', filesep()); x13_binary = sprintf('%s%s%s', dseries_x13_root, 'osx', filesep());
if is64bit() if is64bit()
x13_binary = sprintf('%s%s%s%s', x13_binary, '64', filesep(), 'x13'); x13_binary = sprintf('%s%s%s%s', x13_binary, '64', filesep(), 'x13as');
else else
x13_binary = sprintf('%s%s%s%s', x13_binary, '32', filesep(), 'x13'); x13_binary = sprintf('%s%s%s%s', x13_binary, '32', filesep(), 'x13as');
end end
elseif isunix() elseif isunix()
x13_binary = sprintf('%s%s%s', dseries_x13_root, 'linux', filesep()); x13_binary = sprintf('%s%s%s', dseries_x13_root, 'linux', filesep());
if is64bit() if is64bit()
x13_binary = sprintf('%s%s%s%s', x13_binary, '64', filesep(), 'x13'); x13_binary = sprintf('%s%s%s%s', x13_binary, '64', filesep(), 'x13as');
else else
x13_binary = sprintf('%s%s%s%s', x13_binary, '32', filesep(), 'x13'); x13_binary = sprintf('%s%s%s%s', x13_binary, '32', filesep(), 'x13as');
end end
elseif ispc() elseif ispc()
x13_binary = sprintf('%s%s%s', dseries_x13_root, 'windows', filesep()); x13_binary = sprintf('%s%s%s', dseries_x13_root, 'windows', filesep());
if is64bit() if is64bit()
x13_binary = sprintf('%s%s%s%s', x13_binary, '64', filesep(), 'x13.exe'); x13_binary = sprintf('%s%s%s%s', x13_binary, '64', filesep(), 'x13as.exe');
else else
x13_binary = sprintf('%s%s%s%s', x13_binary, '32', filesep(), 'x13.exe'); x13_binary = sprintf('%s%s%s%s', x13_binary, '32', filesep(), 'x13as.exe');
end end
else else
error('X13 binary is not available for this plateform') error('X13 binary is not available for this plateform')
......
Markdown is supported
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