Adapted Simulink lib support to new scheme.

diff --git a/rpp/rpp/rpp_lib_support.m b/rpp/rpp/rpp_lib_support.m
index ad164e093f225b720ba7e55b016154972e147832..17006cd813d75d96c3f3d8a0d33b822f70792879 100644 (file)
--- a/rpp/rpp/rpp_lib_support.m
+++ b/rpp/rpp/rpp_lib_support.m
@@ -23,7 +23,7 @@
 % References:
 %     rtw_ug.pdf p. 1058
 %     rtw_ref.pdf p. 56
-%     Readme file in <RppRoot>/rpp/lib/os/README.txt
+%     Readme file in <RppRoot>/rpp/lib/rpp/doc/os.txt
 
 
 function rpp_lib_support(modelName, buildInfo)
@@ -45,7 +45,7 @@ function rpp_freertos_support(modelName, buildInfo)
                'timers.c'   };
 
     % Get working directories
-    osLibRoot = fullfile(getpref('rpp', 'RppLibRoot'), 'os', 'src');
+    osLibRoot = fullfile(getpref('rpp', 'RppLibRoot'), 'rpp', 'src', 'os');
     % TODO: get suffix from rpp.tlc BuildDirSuffix
     modelRoot = Simulink.fileGenControl('getConfig').CodeGenFolder;
     outputFolder = fullfile(modelRoot, [modelName, '_rpp']);

diff --git a/rpp/rpp/target_tools.mk b/rpp/rpp/target_tools.mk
index bb82bbff7b4b6cf578e85b2050f630b1d8f88fc4..6555f87f87f580b8b516bdc1e4d682d806efeb0f 100644 (file)
--- a/rpp/rpp/target_tools.mk
+++ b/rpp/rpp/target_tools.mk
@@ -37,8 +37,7 @@ 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="$(COMPILER_ROOT)/include" \
-          --include_path="$(RPP_LIB_ROOT)/os/include" \
-          --include_path="$(RPP_LIB_ROOT)/drv/include"
+          --include_path="$(RPP_LIB_ROOT)/rpp/include"
 
 CFLAGS          += $(OPTS)
 CDEBUG           = -g