Changeset 190 for trunk


Ignore:
Timestamp:
Feb 17, 2006 11:08:59 AM (18 years ago)
Author:
cxsong
Message:

removed -d option when copying matlab/octave - on MacOS, -d is not supported.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile

    r167 r190  
    141141                mkdir $(RP_INSTALL_BASE)/lib/matlab; \
    142142        fi
    143         cp -d $(MATLAB_SRC)/*.mex* $(RP_INSTALL_BASE)/lib/matlab
     143        cp $(MATLAB_SRC)/*.mex* $(RP_INSTALL_BASE)/lib/matlab
     144#       cp -d $(MATLAB_SRC)/*.mex* $(RP_INSTALL_BASE)/lib/matlab
    144145
    145146#### Octave ########################################################
     
    148149                mkdir $(RP_INSTALL_BASE)/lib/octave; \
    149150        fi
    150         cp -d $(OCTAVE_SRC)/*.oct* $(RP_INSTALL_BASE)/lib/octave
     151        cp $(OCTAVE_SRC)/*.oct* $(RP_INSTALL_BASE)/lib/octave
     152#       cp -d $(OCTAVE_SRC)/*.oct* $(RP_INSTALL_BASE)/lib/octave
    151153
    152154
     
    227229# matlab bindings
    228230MEX_INCLS = $(INCL_MATLAB) $(INCL_CORE) $(INCL_CEE) $(INCL_RP_DEPS)
    229 MEX_OPTS = -g -outdir $(MATLAB_SRC) -L$(LIB_DIR) -lrappture
     231MEX_OPTS = -g -outdir $(MATLAB_SRC) -L$(LIB_DIR) -lrappture $(LIB_SCEW_FLAG)
    230232MATLAB_COMP_ARGS = $(MATLAB_SRC)/RpMatlabInterface.cc $(MEX_INCLS) $(MEX_OPTS)
    231233
     
    270272
    271273OCT_INCLS = $(INCL_OCTAVE) $(INCL_CORE) $(INCL_RP_DEPS)
    272 OCTAVE_COMP_ARGS = $(OCT_INCLS) -L$(LIB_DIR) -lrappture
     274OCTAVE_COMP_ARGS = $(OCT_INCLS) -L$(LIB_DIR) -lrappture $(LIB_SCEW_FLAG)
    273275RpOctave:
    274276        $(OCT) $(OCTAVE_SRC)/rpAddPresets.cc            $(OCTAVE_COMP_ARGS)
Note: See TracChangeset for help on using the changeset viewer.