Use CFLAGS defined in Makefile.rules

Previously, Simulink used different flags, which might become inconsistent
with the library flags. Now, it is ensured that both library and Simulink
models use the same CFLAGS.

diff --git a/rpp/lib b/rpp/lib
index bcc51b05171e724172a568ca7e76093ddb117c66..cbc9f2827c20024012c4131430492177c3cbb25b 160000 (submodule)
--- a/rpp/lib
+++ b/rpp/lib
@@ -1 +1 @@
-Subproject commit bcc51b05171e724172a568ca7e76093ddb117c66
+Subproject commit cbc9f2827c20024012c4131430492177c3cbb25b

diff --git a/rpp/rpp/target_tools.mk b/rpp/rpp/target_tools.mk
index dfdc103401d53243f1d2814e8eaba0582aa348d4..ddf2466f0a8d48f1f1f1fb31fca557edbb245b3e 100644 (file)
--- a/rpp/rpp/target_tools.mk
+++ b/rpp/rpp/target_tools.mk
@@ -23,10 +23,10 @@
 
 include $(START_DIR)/slprj/target_paths.mk
 include $(RPP_LIB_ROOT)/Makefile.config
+include $(RPP_LIB_ROOT)/build/Makefile.rules
 
 # RPP options
 RPP_STATIC_LIB   = rpp-lib.lib
-RPP_OS_LAYER_INC = $(RPP_LIB_ROOT)/os/7.0.2/include/
 
 # Options for target source files
 TARGET_INCS      =
@@ -34,18 +34,7 @@ TARGET_SRCS      =
 
 # Compiler command and options
 CC      = "$(COMPILER_ROOT)/bin/armcl"
-CFLAGS  = $(TARGET_CFLAGS)                                              \
-          -mv7R4 --code_state=32 --float_support=VFPv3D16               \
-          --abi=eabi --compile_only -O2 --gcc --diag_wrap=on            \
-          --diag_warning=225 --display_error_number                     \
-          --enum_type=packed --gen_func_subsections                     \
-          -DEXTMODE_DISABLEPRINTF                                       \
-          --include_path="$(RPP_LIB_ROOT)/rpp/include"                  \
-          --include_path="$(RPP_LIB_ROOT)/lwip/src/include"             \
-          --include_path="$(RPP_LIB_ROOT)/lwip/src/include/ipv4"        \
-          --include_path="$(RPP_LIB_ROOT)/lwip/src/include/ipv6"        \
-          --include_path="$(RPP_OS_LAYER_INC)"                          \
-          --include_path="$(COMPILER_ROOT)/include"
+CFLAGS  = $(RPP_CFLAGS) -O2
 
 # Define when external mode should wait for host connection
 # CFLAGS += -DON_TARGET_WAIT_FOR_START