]> rtime.felk.cvut.cz Git - jenkicar/rpp-simulink.git/commitdiff
Compile extmode TCP/IP transport layer
authorJakub NejedlĂ˝ <nejedjak@fel.cvut.cz>
Wed, 28 Aug 2019 07:41:07 +0000 (09:41 +0200)
committerMichal Sojka <michal.sojka@cvut.cz>
Sun, 8 Sep 2019 23:57:48 +0000 (01:57 +0200)
rpp/rpp/rpp.tmf

index 4c16836e56ade21a8cb00975744974b3ad76b323..64628992ec9f6c46796c6157e07ec48f8bce31f1 100644 (file)
@@ -96,15 +96,15 @@ ifeq ($(EXT_MODE),1)
   EXT_SRC     = ext_svr.c updown.c ext_work.c
   LINT_EXT_COMMON_SRC =
   LINT_EXT_TCPIP_SRC  =
-  ifeq ($(EXTMODE_TRANSPORT),0) #serial
+  ifeq ($(EXTMODE_TRANSPORT),0) #tcpip
+    EXT_SRC += rtiostream_interface.c rtiostream_tcpip.c
+    LINT_EXT_COMMON_SRC = ext_svr.c updown.c ext_work.c
+    LINT_EXT_TCPIP_SRC  = rtiostream_interface.c rtiostream_tcpip.c
+  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
   endif
-#   ifeq ($(EXTMODE_TRANSPORT),1) #tcpip
-#     EXT_SRC +=  rtiostream_interface.c rtiostream_tcpip.c
-#     LINT_EXT_COMMON_SRC = ext_svr.c updown.c ext_work.c
-#     LINT_EXT_TCPIP_SRC  = rtiostream_interface.c rtiostream_tcpip.c
-#   endif
   ifeq ($(TMW_EXTMODE_TESTING),1)
     EXT_SRC     += ext_test.c
     EXT_CC_OPTS += -DTMW_EXTMODE_TESTING
@@ -356,8 +356,14 @@ endif
 
 |>END_EXPAND_RULES<|
 
-%$(OBJ_EXT): $(MATLAB_ROOT)/rtw/c/src/ext_mode/serial/%.c
+%$(OBJ_EXT): $(TARGET_ROOT)/%.c
        $(CC) -c $< $(CFLAGS) $(CCOUTPUTFLAG)$@
 
-%$(OBJ_EXT): $(TARGET_ROOT)/%.c
+%$(OBJ_EXT) : $(TARGET_ROOT)/rtw/c/src/ext_mode/common/%.c
        $(CC) -c $< $(CFLAGS) $(CCOUTPUTFLAG)$@
+
+%$(OBJ_EXT): $(MATLAB_ROOT)/rtw/c/src/ext_mode/serial/%.c
+       $(CC) -c $< $(CFLAGS) $(CCOUTPUTFLAG)$@
+
+%$(OBJ_EXT): $(MATLAB_ROOT)/rtw/c/src/ext_mode/custom/%.c
+       $(CC) -c $< $(CFLAGS) $(CCOUTPUTFLAG)$@
\ No newline at end of file