ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-18 02:40:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Need to include SimTime.hh for ICG and swig processing.

Browse Source 
Added the sim time header files to files_to_ICG.hh and sim_services.i so it will be processed.

refs #247
This commit is contained in:
Alex Lin 2016-06-15 16:11:09 -05:00
parent 237230dc53
commit fb4601734f
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/trick/files_to_ICG.hh
View File

@ -52,6 +52,8 @@
#include "trick/RKF78_Integrator.hh"
#include "trick/RKG4_Integrator.hh"
#include "trick/SimTime.hh"
/* from the er7_utils directory */
#ifdef USE_ER7_UTILS_INTEGRATORS
#include "er7_utils/trick/include/files_to_ICG.hh"

5
libexec/trick/pm/s_source.pm
View File

@ -20,7 +20,6 @@ sub s_source($) {
# Get Trick version
my ($version, $thread) = get_trick_version() ;
$thread =~ s/\d+\.// ;
#---------------------------
# Get date
@ -183,9 +182,9 @@ PURPOSE:
"void memory_init( void ) {\n\n" ;
print S_SOURCE " " x 4 , "ALLOC_INFO * ai ;\n" ;
print S_SOURCE " " x 4 , "exec_set_version_date_tag\( \"@(#)CP Version $version-$thread, $date\" \) ;\n" ;
print S_SOURCE " " x 4 , "exec_set_version_date_tag\( \"@(#)CP Version $version, $date\" \) ;\n" ;
print S_SOURCE " " x 4 , "exec_set_build_date\( \"$date\" \) ;\n" ;
print S_SOURCE " " x 4 , "exec_set_current_version\( \"$version-$thread\" \) ;\n\n" ;
print S_SOURCE " " x 4 , "exec_set_current_version\( \"$version\" \) ;\n\n" ;
print S_SOURCE " " x 4 , "populate_sim_services_class_map\(\) ;\n" ;
print S_SOURCE " " x 4 , "populate_sim_services_enum_map\(\) ;\n" ;

1
share/trick/sim_objects/default_trick_sys.sm
View File

@ -93,6 +93,7 @@ a replacement SimObject will create an uncompilable sim.
##include "trick/RtiStager.hh"
##include "trick/RtiExec.hh"
##include "trick/UdUnits.hh"
##include "trick/SimTime.hh"
// This is a user header block. Code here is copied without processing to S_source.hh
%header{

3
trick_source/trick_swig/sim_services.i
View File

@ -99,6 +99,9 @@
#include "trick/RKF78_Integrator.hh"
#include "trick/RKG4_Integrator.hh"
#include "trick/SimTime.hh"
#include "trick/simtime_proto.h"
#include "trick/MSSocket.hh"
#include "trick/MSSharedMem.hh"
#include "trick/Master.hh"