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

Merge branch 'master' of https://github.com/cherpin00/trick

Browse Source
This commit is contained in:
Caleb Herpin 2021-08-02 23:55:11 -05:00
commit ec34ed2f19
9 changed files with 8 additions and 3219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -242,6 +242,13 @@ ${TRICK_HOME}/include/civet/civetweb.h: ${CIVET_CLONE_DIR} ${TRICK_HOME}/include
${TRICK_HOME}/include/civet/CivetServer.h: ${CIVET_CLONE_DIR} ${TRICK_HOME}/include/civet
cp ${CIVET_CLONE_DIR}/include/CivetServer.h ${TRICK_HOME}/include/civet/CivetServer.h
ifeq (${TRICK_FORCE_32BIT},1)
CIVET_COMPILE_FAGS=-m32
else
CIVET_COMPILE_FAGS=-m32
endif
${CIVET_CLONE_DIR}/libcivetweb.a: ${CIVET_CLONE_DIR}
$(MAKE) -C ${CIVET_CLONE_DIR} lib COPT=${CIVET_COMPILE_FAGS} WITH_CPP=1 WITH_WEBSOCKET=1

558
docs/documentation/web/Adding_a_Web_Server_to_Your_Sim.html
View File

File diff suppressed because one or more lines are too long

583
docs/documentation/web/Extending_the_HTTP-API.html
View File

File diff suppressed because one or more lines are too long

736
docs/documentation/web/Extending_the_WS-API.html
View File

File diff suppressed because one or more lines are too long

633
docs/documentation/web/HTTP-API_alloc_info.html
View File

File diff suppressed because one or more lines are too long

659
docs/documentation/web/WS-API_VariableServer.html
View File

File diff suppressed because one or more lines are too long

44
docs/documentation/web/index.html
View File

@ -1,44 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<link rel="stylesheet" type="text/css" href="style.css">
<title>Web Server Documentation</title>
<div class="header">
<table>
<th><img src="trick_icon.png" height="64" width="64"></th>
<th><h1>Web Server Documentation</h1></th>
</table>
</div>
</head>
<body>
<div style="background:#efefef">
<ul>
<p>Provides access to information about your sim, or from your sim.</p>
<li>
<h2>
<a href="Adding_a_Web_Server_to_Your_Sim.html">Adding a Web Server to Your Sim</a>
</h2></li>
<li>
<h2>Web Server APIs</h2>
<ul>
<li><a href="HTTP-API_alloc_info.html">HTTP-API: alloc_info</a></li>
<li><a href="WS-API_VariableServer.html">WS-API: VariableServer</a></li>
</ul>
</li>
<li>
<h2>Adding New Web Server APIs</h2>
<ul>
<li><a href="Extending_the_HTTP-API.html">Extending the HTTP-API</a></li>
<li><a href="Extending_the_WS-API.html">Extending the WS-API</a></li>
</ul>
</li>
</div>
</body>
</html>

5
share/trick/makefiles/Makefile.common
View File

@ -172,17 +172,12 @@ ifneq ($(GSL_HOME),)
endif
TRICK_CIVET=0
CIVET_COMPILE_FAGS=
ifneq (${TRICK_DISABLE_CIVET},1)
TRICK_CIVET=1
TRICK_LIBS += ${TRICK_LIB_DIR}/libcivetweb.a ${TRICK_LIB_DIR}/libtrickCivet.a
TRICK_SWIG_FLAGS += -DUSE_CIVET
TRICK_SYSTEM_CXXFLAGS += -DUSE_CIVET
TRICK_ICG_EXCLUDE += ${TRICK_HOME}/include/civet
ifeq (${TRICK_FORCE_32BIT},1)
CIVET_COMPILE_FAGS=-m32 #TODO Append and don't reset variable. Currently when we do this it adds a space.
endif
endif
# We pipe the output of compiler through tee. If the user wanted gcc color, make sure they get it.

2
trick_sims/Cannon/SIM_cannon_numeric/S_define
View File

@ -9,7 +9,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 {