]> rtime.felk.cvut.cz Git - jenkicar/rpp-simulink.git/commitdiff
Rename rtiostream_serial.c to rtiostream_serial_rpp.c
authorMichal Sojka <michal.sojka@cvut.cz>
Sun, 8 Sep 2019 21:02:45 +0000 (23:02 +0200)
committerMichal Sojka <michal.sojka@cvut.cz>
Sun, 8 Sep 2019 23:58:15 +0000 (01:58 +0200)
The reason is that the makefile (.tmf) tried to compile
<MATLAB>/rtw/c/src/rtiostream/rtiostreamserial/rtiostream_serial.c
instead of rtiostream_serial.c from our rpp directory and it fails. By
renaming the file Makefile finds only our file.

rpp/rpp/.gitattributes
rpp/rpp/rpp.tmf
rpp/rpp/rtiostream_serial_rpp.c [moved from rpp/rpp/rtiostream_serial.c with 100% similarity]

index a1503240b0f7b442fd7fad8a609a8ce3d337cf6b..86cab0aae7c16d30a1a04f382d06f5f010ef8915 100644 (file)
@@ -11,7 +11,7 @@
 /rpp_setup.m   eaton
 /rpp_simulink_runtime.h        eaton
 /rpp_srmain.tlc        eaton
-/rtiostream_serial.c   eaton
+/rtiostream_serial_rpp.c       eaton
 /rtiostream_tcpip.c    eaton
 /sl_customization.m    eaton
 /target_tools.mk       eaton
index 64628992ec9f6c46796c6157e07ec48f8bce31f1..2c24b05a8e3cc0b34d4324e6cbbf1b540b7dc2c4 100644 (file)
@@ -103,7 +103,7 @@ ifeq ($(EXT_MODE),1)
   endif
   ifeq ($(EXTMODE_TRANSPORT),1) #serial
     EXT_SRC += ext_svr_serial_transport.c ext_serial_pkt.c
-    EXT_SRC += rtiostream_serial_interface.c rtiostream_serial.c
+    EXT_SRC += rtiostream_serial_interface.c rtiostream_serial_rpp.c
   endif
   ifeq ($(TMW_EXTMODE_TESTING),1)
     EXT_SRC     += ext_test.c