Not throwing error.

Makefile

@@ -156,6 +156,8 @@ ICG: ${TRICK_HOME}/include/mongoose/mongoose.h
 endif
 
 all: civetweb
+icg_sim_serv: civetweb
+ICG: civetweb
 #-------------------------------------------------------------------------------
 # 1.1 Build Trick-core
 no_dp: $(TRICK_LIB) $(TRICK_SWIG_LIB)
@@ -232,7 +234,7 @@ CIVET_CLONE_DIR = civetweb_clone
 civetweb: ${TRICK_LIB_DIR}/libcivetweb.a 
 	$(MAKE) -C ${TRICK_HOME}/trick_source/web/CivetServer
 
-${TRICK_LIB_DIR}/libcivetweb.a: ${CIVET_CLONE_DIR} 
+${TRICK_LIB_DIR}/libcivetweb.a: ${CIVET_CLONE_DIR} | ${TRICK_LIB_DIR}
 	cp ${CIVET_CLONE_DIR}/libcivetweb.a $(TRICK_LIB_DIR)/libcivetweb.a
 	mkdir -p ${TRICK_HOME}/include/civet/
 	cp ${CIVET_CLONE_DIR}/include/civetweb.h ${TRICK_HOME}/include/civet/civetweb.h

include/trick/WebSocketSession.hh

@@ -5,9 +5,7 @@ PURPOSE: (Represent Websocket connection.)
 #define WEB_SOCKET_SESSION_HH
 
 #include <string>
-#ifndef SWIG
 #include "civet/CivetServer.h"
-#endif
 
 class WebSocketSession {
     public:

include/trick/files_to_ICG.hh

@@ -104,5 +104,6 @@
 #include "trick/WebSocketSession.hh"
 #endif
 #include "trick/CivetServer.hh"
+#include "trick/WebSocketSession.hh"
 
 #endif

share/trick/makefiles/Makefile.common

@@ -178,6 +178,10 @@ ifeq (${TRICK_MONGOOSE},1)
 	TRICK_ICG_EXCLUDE += :${TRICK_HOME}/include/mongoose
 endif
 
+TRICK_LIBS += ${TRICK_LIB_DIR}/libcivetweb.a ${TRICK_LIB_DIR}/libtrickCivet.a
+TRICK_ICG_EXCLUDE += ${TRICK_HOME}/include/civet
+TRICK_SWIG_EXCLUDE += ${TRICK_HOME}/include/civet
+
 # We pipe the output of compiler through tee.  If the user wanted gcc color, make sure they get it.
 ifdef GCC_COLORS
     TRICK_SYSTEM_CXXFLAGS += -fdiagnostics-color=always

share/trick/sim_objects/CivetServer.sm

@@ -3,7 +3,7 @@ PURPOSE:
     (Trick HTTP Server)
 LIBRARY DEPENDENCIES:
     (
-     (/home/cherpin/git/trick_fork/trick_source/web/CivetServer/src/CivetServer.cpp)
+     (../../../lib/libcivetweb.a)
     )
 
 *************************************************************/

trick_sims/Cannon/SIM_cannon_numeric/RUN_graphics/input.py

@@ -3,6 +3,7 @@ exec(open("Modified_data/realtime.py").read())
 #==========================================
 # Start the Cannonball Graphics Client
 #==========================================
+trick.var_server_set_port(5001);
 varServerPort = trick.var_server_get_port();
 CannonDisplay_path = "../models/graphics/dist/CannonDisplay.jar"
 

trick_sims/Cannon/SIM_cannon_numeric/S_overrides.mk

@@ -1,4 +1,3 @@
 TRICK_CFLAGS   += -I../models
 TRICK_CXXFLAGS += -I../models
 
-TRICK_USER_LINK_LIBS += ${TRICK_HOME}/lib/libtrickCivet.a ${TRICK_HOME}/lib/libcivetweb.a

trick_source/trick_swig/sim_services.i

@@ -145,7 +145,7 @@
 #include "trick/Flag.h"
 #include "trick/UdUnits.hh"
 #include "trick/WebServer.hh"
-#include "trick/CivetServer.hh"
+// #include "trick/CivetServer.hh"
 
 #ifdef USE_ER7_UTILS_INTEGRATORS
 #include "er7_utils/integration/core/include/integrator_constructor_factory.hh"

trick_source/web/CivetServer/include/VariableServerSession.hh

@@ -7,7 +7,9 @@ PURPOSE: (Represent the state of a variable server websocket connection.)
 
 #include <vector>
 #include <string>
+
 #include "civet/CivetServer.h"
+
 #include "trick/WebSocketSession.hh"
 #include "VariableServerVariable.hh"
 

trick_source/web/CivetServer/include/VariableServerVariable.hh

@@ -8,7 +8,9 @@ LIBRARY DEPENDENCIES:
 
 #include <time.h>
 #include <vector>
+
 #include "civet/CivetServer.h"
+
 #include <iostream>
 #include <trick/reference.h>
 

trick_source/web/CivetServer/include/http_GET_handlers.hh

@@ -5,6 +5,7 @@ LIBRARY DEPENDENCIES:
 **************************************************************************/
 #ifndef HANDLE_HTTP_GET_HANDLERS_HH
 #define HANDLE_HTTP_GET_HANDLERS_HH
+#include <cstddef>
 
 #include "civet/CivetServer.h"
 

trick_source/web/CivetServer/src/CivetServer.cpp

@@ -22,7 +22,7 @@ PURPOSE: (Represent the state and initial conditions for my server)
 #include "trick/WebSocketSession.hh"
 
 #include "civet/CivetServer.h"
-#include "civet/civetweb.h"
+
 #include "../include/http_GET_handlers.hh"
 
 pthread_mutex_t lock_requests;
@@ -255,4 +255,4 @@ int begin_request(struct mg_connection* conn) {
     int id = iter->second;
     std::cout << "Processing request: " << id << std::endl;
     return 0;
-}
+}

trick_source/web/CivetServer/src/http_GET_handlers.cpp

@@ -8,7 +8,7 @@ LIBRARY DEPENDENCIES:
 #include "trick/CivetServer.hh"
 
 #include "civet/CivetServer.h"
-#include "civet/civetweb.h"
+
 #include <sstream>
 
 #include "trick/VariableServer.hh"
@@ -192,4 +192,4 @@ void ws_close_handler(const struct mg_connection *conn,
 {
 	MyCivetServer* server = (MyCivetServer*) my_server;
 	server->deleteWebSocketSession(const_cast<mg_connection*>(conn));
-}
+}

trick_source/web/HttpServer/src/_CivetServer.cpp

@@ -20,7 +20,7 @@ PURPOSE: (Represent the state and initial conditions for my server)
 #include "trick/WebSocketSession.hh"
 
 #include "civet/CivetServer.h"
-#include "civet/civetweb.h"
+
 #include "handlers.cpp"
 
 
@@ -217,4 +217,4 @@ int MyCivetServer::shutdown() {
 int MyCivetServer::join() {
     pthread_join(server_thread, NULL);
     return 0;
-}
+}