From 8042806f486d74c7899b78ac19ed31f47ba61220 Mon Sep 17 00:00:00 2001
From: Caleb Herpin <caleb.herpin@gmail.com>
Date: Tue, 6 Jul 2021 12:38:14 -0500
Subject: [PATCH] Trying to get Swig to work with CivetServer.  Not working

---
 include/trick/files_to_ICG.hh                                 | 1 +
 share/trick/sim_objects/CivetServer.sm                        | 2 +-
 .../Cannon/SIM_cannon_numeric/Modified_data/realtime.py       | 4 ++--
 trick_sims/Cannon/SIM_cannon_numeric/S_overrides.mk           | 1 +
 trick_source/trick_swig/sim_services.i                        | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/trick/files_to_ICG.hh b/include/trick/files_to_ICG.hh
index bd921f14..da6856e9 100644
--- a/include/trick/files_to_ICG.hh
+++ b/include/trick/files_to_ICG.hh
@@ -103,5 +103,6 @@
 #include "trick/WebServer.hh"
 #include "trick/WebSocketSession.hh"
 #endif
+#include "trick/CivetServer.hh"
 
 #endif
diff --git a/share/trick/sim_objects/CivetServer.sm b/share/trick/sim_objects/CivetServer.sm
index 543a10a5..dcdbdb65 100644
--- a/share/trick/sim_objects/CivetServer.sm
+++ b/share/trick/sim_objects/CivetServer.sm
@@ -3,7 +3,7 @@ PURPOSE:
     (Trick HTTP Server)
 LIBRARY DEPENDENCIES:
     (
-     (/home/cherpin/git/trick/trick_source/web/HttpServer/src/CivetServer.cpp)
+     (/home/cherpin/git/trick_fork/trick_source/web/CivetServer/src/CivetServer.cpp)
     )
 
 *************************************************************/
diff --git a/trick_sims/Cannon/SIM_cannon_numeric/Modified_data/realtime.py b/trick_sims/Cannon/SIM_cannon_numeric/Modified_data/realtime.py
index e8ce8380..405da0fb 100644
--- a/trick_sims/Cannon/SIM_cannon_numeric/Modified_data/realtime.py
+++ b/trick_sims/Cannon/SIM_cannon_numeric/Modified_data/realtime.py
@@ -7,5 +7,5 @@ trick.itimer_enable()
 trick.exec_set_enable_freeze(True)
 trick.exec_set_freeze_command(True)
 
-simControlPanel = trick.SimControlPanel()
-trick.add_external_application(simControlPanel)
+#simControlPanel = trick.SimControlPanel()
+#trick.add_external_application(simControlPanel)
diff --git a/trick_sims/Cannon/SIM_cannon_numeric/S_overrides.mk b/trick_sims/Cannon/SIM_cannon_numeric/S_overrides.mk
index 6d727b68..21446f55 100644
--- a/trick_sims/Cannon/SIM_cannon_numeric/S_overrides.mk
+++ b/trick_sims/Cannon/SIM_cannon_numeric/S_overrides.mk
@@ -1,3 +1,4 @@
 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/trick_swig/sim_services.i b/trick_source/trick_swig/sim_services.i
index c2ea71d8..1cdad0e9 100644
--- a/trick_source/trick_swig/sim_services.i
+++ b/trick_source/trick_swig/sim_services.i
@@ -145,6 +145,7 @@
 #include "trick/Flag.h"
 #include "trick/UdUnits.hh"
 #include "trick/WebServer.hh"
+#include "trick/CivetServer.hh"
 
 #ifdef USE_ER7_UTILS_INTEGRATORS
 #include "er7_utils/integration/core/include/integrator_constructor_factory.hh"