Subversion Repositories shark

Compare Revisions

Regard whitespace Rev 1343 → Rev 1342

/demos/trunk/rtw/rt_sim_shark.c
8,8 → 8,6
#endif
#include "rt_sim.h"
 
#include "kernel/kern.h"
 
#ifndef RT_MALLOC /* statically declare data */
 
/*==========*
/demos/trunk/rtw/makefile
12,16 → 12,15
 
DEFINE_MODEL = test
DEFINE_NUMST = 1
DEFINE_RTWLIB += -lrtw
 
PROGS = rtw
 
RTW_CFG = "-I$(MATLAB_ROOT)/simulink/include -I$(MATLAB_ROOT)/extern/include -I$(MATLAB_ROOT)/rtw/c/src -I$(MATLAB_ROOT)/rtw/c/libsrc -I$(MATLAB_RTW_DEMO_DIR) -DUSE_RTMODEL -DRT -DMODEL=$(DEFINE_MODEL) -DNUMST=$(DEFINE_NUMST)"
 
RTW_OBJS = $(MATLAB_RTW_DEMO_DIR)/$(DEFINE_MODEL).o $(MATLAB_RTW_DEMO_DIR)/$(DEFINE_MODEL)_data.o $(MODULES_rtwlib)
RTW_OBJS = $(MATLAB_RTW_DEMO_DIR)/$(DEFINE_MODEL).o $(MATLAB_RTW_DEMO_DIR)/$(DEFINE_MODEL)_data.o
 
include $(BASE)/config/example.mk
 
rtw:
make -f $(SUBMAKE) OTHERLIBS=$(DEFINE_RTWLIB) OTHERINCL=$(RTW_CFG) APP=rtw INIT= OTHEROBJS="initfile.o rt_sim_shark.o $(RTW_OBJS)" SHARKOPT="__OLDCHAR__"
make -f $(SUBMAKE) OTHERINCL=$(RTW_CFG) APP=rtw INIT= OTHEROBJS="initfile.o $(RTW_OBJS)" SHARKOPT="__OLDCHAR__"
 
/demos/trunk/rtw/rtw.c
215,6 → 215,13
 
MdlOutputs(0);
 
GBLbuf.errmsg = rt_UpdateTXYLogVars(rtmGetRTWLogInfo(S),
rtmGetTPtr(S));
if (GBLbuf.errmsg != NULL) {
GBLbuf.stopExecutionFlag = 1;
return;
}
 
MdlUpdate(0);
rt_SimUpdateDiscreteTaskSampleHits(rtmGetNumSampleTimes(S),
rtmGetTimingData(S),