Changeset 923 for trunk


Ignore:
Timestamp:
Jan 15, 2016, 11:02:37 AM (5 years ago)
Author:
g7moreau
Message:
  • Update MCRROOT variable with mcrversion matlab function
Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/compile.m

    r908 r923  
    4343    SubfctPath=['-I ' SubfctPath];%string indicating the option of including the path SubfctPath
    4444end
    45 hver=ver('MATLAB');
    46 FctNameVersion=[FctName '_MCRROOT' regexprep(hver.Version,'\.','')];%suppress the dot in version number
     45[mcrmajor, mcrminor] = mcrversion;   
     46MCRROOT = ['MCRROOT',int2str(mcrmajor),int2str(mcrminor)];
     47FctNameVersion=[FctName,'_',MCRROOT];
     48%hver=ver('MATLAB');
     49%FctNameVersion=[FctName '_MCRROOT' regexprep(hver.Version,'\.','')];%suppress the dot in version number
    4750try
    4851    disp(['mcc -m -R -nojvm -R -nodisplay -R -singleCompThread ' SubfctPath ' ' FctName '.m'])
  • trunk/src/series.m

    r922 r923  
    15101510    set(handles.series,'Pointer','watch') % set the mouse pointer to 'watch'
    15111511    set(handles.ActionExt,'BackgroundColor',[1 1 0])
    1512     hver=ver('MATLAB');
    1513     MCRROOT=['MCRROOT' regexprep(hver.Version,'\.','')];%suppress the dot in version number
     1512    [mcrmajor, mcrminor] = mcrversion;   
     1513    MCRROOT = ['MCRROOT',int2str(mcrmajor),int2str(mcrminor)];
     1514    %hver=ver('MATLAB');
     1515    %MCRROOT=['MCRROOT' regexprep(hver.Version,'\.','')];%suppress the dot in version number
    15141516    RunTime = getenv(MCRROOT);
    15151517    ActionNameVersion=[ActionName '_' MCRROOT];
Note: See TracChangeset for help on using the changeset viewer.