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

Edited 32 bit make target

Browse Source
This commit is contained in:
Caleb Herpin 2021-08-01 10:59:34 -05:00
parent 214a4a87b5
commit cba0917de2
2 changed files with 7 additions and 5 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

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

@ -172,17 +172,12 @@ ifneq ($(GSL_HOME),)
endif
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 #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.