Update makefile template to not fail on lwIP compilation

diff --git a/rpp/lib b/rpp/lib
index 21047514604e10f05d08e2eecb0c082cdc44e0e6..3b33020a19f63311ba598bb1e9ce94e5f3d595fd 160000 (submodule)
--- a/rpp/lib
+++ b/rpp/lib
@@ -1 +1 @@
-Subproject commit 21047514604e10f05d08e2eecb0c082cdc44e0e6
+Subproject commit 3b33020a19f63311ba598bb1e9ce94e5f3d595fd

diff --git a/rpp/rpp/target_tools.mk b/rpp/rpp/target_tools.mk
index 0ba81e16276b4ae91893e07f42089f4082352155..f1f28accce1e778b760b57c843f82bc8b0bf3d30 100644 (file)
--- a/rpp/rpp/target_tools.mk
+++ b/rpp/rpp/target_tools.mk
@@ -33,8 +33,7 @@ include $(START_DIR)/slprj/target_paths.mk
 
 # RPP options
 RPP_STATIC_LIB   = "rpp-lib.lib"
-RPP_OS_LAYER_INC = "$(RPP_LIB_ROOT)/os/7.0.2_tms570/include/"
-RPP_RPP_LAYER_INC= "$(RPP_LIB_ROOT)/rpp/include"
+RPP_OS_LAYER_INC = $(RPP_LIB_ROOT)/os/7.0.2_tms570/include/
 
 # Options for target source files
 TARGET_INCS      =
@@ -45,7 +44,10 @@ CC      = "$(COMPILER_ROOT)/bin/armcl"
 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 \
-          --include_path="$(RPP_RPP_LAYER_INC)" \
+          --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"
 
@@ -90,4 +92,3 @@ PROGRAM_FILE_EXT = .o
 
 # Specify extension for final product at end of build
 EXE_FILE_EXT     = .out
-