ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-18 20:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Getting standalone to compile. Fixes #2

Browse Source
This commit is contained in:
Alex Lin 2015-03-02 12:48:17 -06:00
parent c40fa6de0b
commit 87741062e0
5 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -184,16 +184,20 @@ $(ER7_UTILS_DIRS): TRICK_CXXFLAGS += -Wno-unused-parameter
$(ER7_UTILS_DIRS): make_er7_makefiles icg_sim_serv
@ $(MAKE) -C $@ trick
ifeq ($(USE_ER7_UTILS_INTEGRATORS), 1)
.PHONY: make_er7_makefiles
make_er7_makefiles:
@for i in $(ER7_UTILS_DIRS) ; do \
$(CP) ${TRICK_HOME}/trick_source/sim_services/Executive/Makefile $$i; \
done
icg_sim_serv: | make_er7_makefiles
endif
# 1.1.1.4 Generate interface code (using ICG) for the specified sim_services
# header files.
.PHONY: icg_sim_serv
icg_sim_serv: $(ICG_EXE) | make_er7_makefiles
icg_sim_serv: $(ICG_EXE)
${TRICK_HOME}/bin/ICG -s ${TRICK_CXXFLAGS} ${TRICK_HOME}/trick_source/sim_services/include/files_to_ICG.hh
# 1.1.1.4.1 Build the Interface Code Generator (ICG) executable.

30
trick_source/sim_services/Integrator/Makefile_deps
View File

@ -19,17 +19,7 @@ object_${TRICK_HOST_CPU}/IntegLoopManager.o: src/IntegLoopManager.cpp \
src/../include/IntegJobClassId.hh src/../include/IntegLoopScheduler.hh \
src/../include/IntegLoopManager.hh src/../include/Integrator.hh \
src/../include/IntegAlgorithms.hh \
src/../er7_algorithms/ABM_Integrator.hh \
${TRICK_HOME}/trick_source/sim_services/Integrator/include/Integrator.hh \
src/../er7_algorithms/Euler_Cromer_Integrator.hh \
src/../er7_algorithms/Euler_Integrator.hh \
src/../er7_algorithms/MM4_Integrator.hh \
src/../er7_algorithms/NL2_Integrator.hh \
src/../er7_algorithms/RK2_Integrator.hh \
src/../er7_algorithms/RK4_Integrator.hh \
src/../er7_algorithms/RKF45_Integrator.hh \
src/../er7_algorithms/RKF78_Integrator.hh \
src/../er7_algorithms/RKG4_Integrator.hh \
${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/MemoryManager.hh \
${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/mm_error.h \
${TRICK_HOME}/trick_source/sim_services/CheckPointAgent/include/CheckPointAgent.hh \
@ -59,17 +49,7 @@ object_${TRICK_HOST_CPU}/IntegLoopScheduler.o: src/IntegLoopScheduler.cpp \
${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \
${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \
src/../include/IntegAlgorithms.hh \
src/../er7_algorithms/ABM_Integrator.hh \
${TRICK_HOME}/trick_source/sim_services/Integrator/include/Integrator.hh \
src/../er7_algorithms/Euler_Cromer_Integrator.hh \
src/../er7_algorithms/Euler_Integrator.hh \
src/../er7_algorithms/MM4_Integrator.hh \
src/../er7_algorithms/NL2_Integrator.hh \
src/../er7_algorithms/RK2_Integrator.hh \
src/../er7_algorithms/RK4_Integrator.hh \
src/../er7_algorithms/RKF45_Integrator.hh \
src/../er7_algorithms/RKF78_Integrator.hh \
src/../er7_algorithms/RKG4_Integrator.hh \
src/../include/IntegLoopManager.hh src/../include/IntegJobClassId.hh \
${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.h \
${TRICK_HOME}/trick_source/sim_services/Executive/include/sim_mode.h \
@ -94,17 +74,7 @@ object_${TRICK_HOST_CPU}/IntegLoopSimObject.o: src/IntegLoopSimObject.cpp \
${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/var.h \
${TRICK_HOME}/trick_source/sim_services/MemoryManager/include/io_alloc.h \
${TRICK_HOME}/trick_source/sim_services/Integrator/include/IntegAlgorithms.hh \
${TRICK_HOME}/trick_source/sim_services/Integrator/er7_algorithms/ABM_Integrator.hh \
${TRICK_HOME}/trick_source/sim_services/Integrator/include/Integrator.hh \
${TRICK_HOME}/trick_source/sim_services/Integrator/er7_algorithms/Euler_Cromer_Integrator.hh \
${TRICK_HOME}/trick_source/sim_services/Integrator/er7_algorithms/Euler_Integrator.hh \
${TRICK_HOME}/trick_source/sim_services/Integrator/er7_algorithms/MM4_Integrator.hh \
${TRICK_HOME}/trick_source/sim_services/Integrator/er7_algorithms/NL2_Integrator.hh \
${TRICK_HOME}/trick_source/sim_services/Integrator/er7_algorithms/RK2_Integrator.hh \
${TRICK_HOME}/trick_source/sim_services/Integrator/er7_algorithms/RK4_Integrator.hh \
${TRICK_HOME}/trick_source/sim_services/Integrator/er7_algorithms/RKF45_Integrator.hh \
${TRICK_HOME}/trick_source/sim_services/Integrator/er7_algorithms/RKF78_Integrator.hh \
${TRICK_HOME}/trick_source/sim_services/Integrator/er7_algorithms/RKG4_Integrator.hh \
${TRICK_HOME}/trick_source/sim_services/Executive/include/exec_proto.hh \
${TRICK_HOME}/trick_source/sim_services/Executive/include/Executive.hh \
${TRICK_HOME}/trick_source/sim_services/Executive/include/Threads.hh \

2
trick_source/sim_services/Integrator/include/Integrator.hh
View File

@ -18,7 +18,9 @@
#define INTEG_FREE(p) free(p)
#endif
#ifdef USE_ER7_UTILS_INTEGRATORS
#include "er7_utils/integration/core/include/integration_technique.hh"
#endif
/**
* Below are the supported types of integration schemes.

2
trick_source/sim_services/Integrator/src/getIntegrator.cpp
View File

@ -19,11 +19,13 @@ Programmers:
#include "sim_services/MemoryManager/include/memorymanager_c_intf.h"
#include "sim_services/Message/include/message_proto.h"
#ifdef USE_ER7_UTILS_INTEGRATORS
// Interface includes
#include "er7_utils/interface/include/alloc.hh"
// Integration includes
#include "er7_utils/integration/core/include/integrator_constructor_factory.hh"
#endif
// Local includes
#include "../include/Integrator.hh"

2
trick_source/trick_swig/sim_services.i
View File

@ -144,11 +144,13 @@
#include "sim_services/include/Flag.h"
#include "trick_utils/units/include/Unit.hh"
#ifdef USE_ER7_UTILS_INTEGRATORS
#include "er7_utils/integration/core/include/integrator_constructor_factory.hh"
#include "er7_utils/integration/core/include/integrable_object.hh"
#include "er7_utils/integration/core/include/base_integration_group.hh"
#include "er7_utils/trick/integration/include/first_order_ode_integrator.hh"
#include "er7_utils/trick/integration/include/second_order_ode_integrator.hh"
#endif
%}