diff --git a/share/trick/sim_objects/CivetServer.sm b/share/trick/sim_objects/CivetServer.sm new file mode 100644 index 00000000..76b65e65 --- /dev/null +++ b/share/trick/sim_objects/CivetServer.sm @@ -0,0 +1,27 @@ +/************************TRICK HEADER************************* +PURPOSE: + (Trick HTTP Server) +LIBRARY DEPENDENCIES: + ( + (/home/cherpin/git/trick/trick_source/web/HttpServer/src/CivetServer.cpp) + ) + +*************************************************************/ +##include "trick/CivetServer.hh" + +class MyCivetServerSimObject : public Trick::SimObject { + + public: + MyCivetServer server ; + + MyCivetServerSimObject() { + ("default_data") server.default_data() ; + ("initialization") server.init() ; + ("freeze") server.http_top_of_frame() ; + ("top_of_frame") server.http_top_of_frame() ; + ("shutdown") server.shutdown() ; + } +}; + +MyCivetServerSimObject web; + diff --git a/trick_sims/Cannon/SIM_cannon_numeric/S_define b/trick_sims/Cannon/SIM_cannon_numeric/S_define index 48b554c0..59826ab3 100644 --- a/trick_sims/Cannon/SIM_cannon_numeric/S_define +++ b/trick_sims/Cannon/SIM_cannon_numeric/S_define @@ -10,6 +10,7 @@ LIBRARY DEPENDENCIES: #include "sim_objects/default_trick_sys.sm" // #include "sim_objects/WebServer.sm" +#include "sim_objects/CivetServer.sm" ##include "cannon/gravity/include/cannon_numeric.h" class CannonSimObject : public Trick::SimObject { diff --git a/trick_sims/Cannon/SIM_cannon_numeric/S_overrides.mk b/trick_sims/Cannon/SIM_cannon_numeric/S_overrides.mk index b9f6c9af..6d727b68 100644 --- a/trick_sims/Cannon/SIM_cannon_numeric/S_overrides.mk +++ b/trick_sims/Cannon/SIM_cannon_numeric/S_overrides.mk @@ -1,2 +1,3 @@ TRICK_CFLAGS += -I../models TRICK_CXXFLAGS += -I../models +TRICK_USER_LINK_LIBS += ${TRICK_HOME}/lib/libtrickCivet.a ${TRICK_HOME}/lib/libcivetweb.a diff --git a/trick_source/web/CivetServer/makefile b/trick_source/web/CivetServer/makefile index 68f5a457..ecf39445 100644 --- a/trick_source/web/CivetServer/makefile +++ b/trick_source/web/CivetServer/makefile @@ -30,12 +30,12 @@ TRICK_HTTP_OBJS = \ ## MODEL TARGETS ## ############################################################################# -all: ${TRICK_LIB_DIR}/libtrickHTTP.a +all: ${TRICK_LIB_DIR}/libtrickCivet.a $(TRICK_HTTP_OBJS): $(OBJDIR)/%.o : src/%.cpp | $(OBJDIR) $(CPP) $(CPPFLAGS) ${TRICK_SYSTEM_CXXFLAGS} ${INCLUDE_DIRS} -c $< -o $@ -${TRICK_LIB_DIR}/libtrickHTTP.a: ${TRICK_HTTP_OBJS} +${TRICK_LIB_DIR}/libtrickCivet.a: ${TRICK_HTTP_OBJS} ar crs $@ ${TRICK_HTTP_OBJS} # ---------------------------------------------------------------------------