Fixing the Simulink build system for the static library. Untested.

diff --git a/rpp/lib/apps/rpp-lib/.cproject b/rpp/lib/apps/rpp-lib/.cproject
index 46a8787f944fe76d1400b60d3e32fc054b41b931..100ffbd0cd4d83e3f172cd16751cb471909dcf2d 100644 (file)
--- a/rpp/lib/apps/rpp-lib/.cproject
+++ b/rpp/lib/apps/rpp-lib/.cproject
@@ -14,7 +14,7 @@
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                               <configuration artifactExtension="lib" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.464304949" name="Debug" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug">
+                               <configuration artifactExtension="lib" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.464304949" name="Debug" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug" postbuildStep="cp rpp-lib.lib ../../../">
                                        <folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.464304949." name="/" resourcePath="">
                                                <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_5.0.libraryDebugToolchain.415620956" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.0.libraryDebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_5.0.library.librarianDebug.1878867764">
                                                        <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.44376464" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
@@ -135,4 +135,5 @@
                        <content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cxxSource" language="com.ti.ccstudio.core.TIGPPLanguage"/>
                </project-mappings>
        </storageModule>
+       <storageModule moduleId="refreshScope"/>
 </cproject>

diff --git a/rpp/lib/rpp-lib.lib b/rpp/lib/rpp-lib.lib
index ce3e97219f5f28e452f8d0ebf74e0481104f69e9..d5c554ecdd1290fed075b53dcf40a0a1ae00ab8c 100644 (file)
Binary files a/rpp/lib/rpp-lib.lib and b/rpp/lib/rpp-lib.lib differ

diff --git a/rpp/rpp/rpp_lib_support.m b/rpp/rpp/rpp_lib_support.m
index 17006cd813d75d96c3f3d8a0d33b822f70792879..8ad9ca5ba89e86df3a014967784e03a3da41b757 100644 (file)
--- a/rpp/rpp/rpp_lib_support.m
+++ b/rpp/rpp/rpp_lib_support.m
@@ -20,6 +20,13 @@
 % Abstract:
 %     Simulink support for RPP library and operating system setup.
 %
+%     DEPRECATED this file is no longer needed and no longer called.
+%     It was called by rpp_select_callback_handler.m and was used to include
+%     source code files in the build. RPP now uses an static library that can
+%     be found in the linker arguments in target_tools.mk. This file is left
+%     for future reference in case, for example, that the external mode support
+%     requires aditional files to be included in the build.
+%
 % References:
 %     rtw_ug.pdf p. 1058
 %     rtw_ref.pdf p. 56

diff --git a/rpp/rpp/rpp_select_callback_handler.m b/rpp/rpp/rpp_select_callback_handler.m
index 9f043a47203c5749605a215cf716a6873fbcc8fd..4ad26da0cae08f391c8ad7a19cd21784c84072a3 100644 (file)
--- a/rpp/rpp/rpp_select_callback_handler.m
+++ b/rpp/rpp/rpp_select_callback_handler.m
@@ -59,8 +59,10 @@ function rpp_select_callback_handler(hDlg, hSrc)
 
     % Configure PostCodeGen Command to execute
     % (library code inclusion for compilation)
-    slConfigUISetVal(hDlg, hSrc, 'PostCodeGenCommand', ...
-        'rpp_lib_support(modelName, buildInfo)');
+    %% Note: No longer needed with static library
+    %% Leaving here for future reference.
+    %%slConfigUISetVal(hDlg, hSrc, 'PostCodeGenCommand', ...
+    %%    'rpp_lib_support(modelName, buildInfo)');
 
 end
 

diff --git a/rpp/rpp/target_tools.mk b/rpp/rpp/target_tools.mk
index 5aa2e0321b5b8d5d5fb6e1b27ce254cd133166df..73ca327ee394054030585ecb8e57d32ec14b3d13 100644 (file)
--- a/rpp/rpp/target_tools.mk
+++ b/rpp/rpp/target_tools.mk
@@ -31,6 +31,11 @@
 
 include $(START_DIR)/slprj/target_paths.mk
 
+# RPP options
+RPP_STATIC_LIB   = "$(RPP_LIB_ROOT)/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"
+
 # Options for target source files
 TARGET_INCS      =
 TARGET_SRCS      =
@@ -41,7 +46,8 @@ 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)/rpp/include"
+          --include_path="$(RPP_OS_LAYER_INC)" \
+          --include_path="$(RPP_RPP_LAYER_INC)"
 
 CFLAGS          += $(OPTS)
 CDEBUG           = -g
@@ -60,7 +66,8 @@ LDFLAGS = -mv7R4 --code_state=32 --float_support=VFPv3D16 --abi=eabi \
           --reread_libs --warn_sections --display_error_number --rom_model \
           -i"$(COMPILER_ROOT)/lib" -i"$(COMPILER_ROOT)/include" \
           --library=rtsv7R4_T_be_v3D16_eabi.lib \
-          "$(RPP_LIB_ROOT)/TMS570LS313xFlashLnk.cmd"
+          --library="$(RPP_STATIC_LIB)" \
+          "$(RPP_LIB_ROOT)/rpp/TMS570LS313xFlashLnk.cmd"
 
 LDDEBUG          = -g
 LDOUTPUTFLAG     = --output_file=