ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-03-11 06:54:12 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Trying 32 bit mode

Browse Source
This commit is contained in:
Caleb Herpin 2021-07-29 17:22:52 -05:00
parent 44c749505a
commit dfd68f000f
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -250,7 +250,7 @@ ${TRICK_HOME}/include/civet/CivetServer.h: ${CIVET_CLONE_DIR} ${TRICK_HOME}/incl
cp ${CIVET_CLONE_DIR}/include/CivetServer.h ${TRICK_HOME}/include/civet/CivetServer.h
${CIVET_CLONE_DIR}/libcivetweb.a: ${CIVET_CLONE_DIR}
$(MAKE) -C ${CIVET_CLONE_DIR} lib WITH_CPP=1 WITH_WEBSOCKET=1
$(MAKE) -C ${CIVET_CLONE_DIR} lib COPT=${CIVET_COMPILE_FAGS} WITH_CPP=1 WITH_WEBSOCKET=1
${CIVET_CLONE_DIR}:
git clone --branch v1.14 --depth 1 https://github.com/civetweb/civetweb.git $@

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

@ -178,17 +178,17 @@ endif
# TRICK_ICG_EXCLUDE += :${TRICK_HOME}/include/mongoose
#endif
ifeq (${TRICK_MONGOOSE},1) #TODO: Make this use a civet flag instead of a mongoose flag and fix repeated logic.
TRICK_CIVET=0
else
ifneq (${TRICK_FORCE_32BIT},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
else
TRICK_CIVET=0
TRICK_CIVET=0
CIVET_COMPILE_FAGS=
ifneq (${TRICK_MONGOOSE},1) #TODO: Make this use a civet flag instead of a mongoose flag.
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
endif
endif