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

Not building civet when in 32 bit mode

Browse Source
This commit is contained in:
Caleb Herpin 2021-07-29 12:08:35 -05:00
parent 6bbca79a5b
commit acad74137f
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,13 +179,17 @@ endif
#endif #endif
ifeq (${TRICK_MONGOOSE},1) #TODO: Make this use a civet flag instead of a mongoose flag ifeq (${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
else
TRICK_CIVET=0 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
endif
endif endif
# We pipe the output of compiler through tee. If the user wanted gcc color, make sure they get it. # We pipe the output of compiler through tee. If the user wanted gcc color, make sure they get it.

1
share/trick/makefiles/config_user.mk.in
View File

@ -18,7 +18,6 @@ JAVAC = @JAVA_CC@
TRICK_OFFLINE = @TRICK_OFFLINE@ TRICK_OFFLINE = @TRICK_OFFLINE@
TRICK_MONGOOSE = @TRICK_MONGOOSE@ TRICK_MONGOOSE = @TRICK_MONGOOSE@
TRICK_CIVET = @TRICK_MONGOOSE@
USE_X_WINDOWS = @USE_X_WINDOWS@ USE_X_WINDOWS = @USE_X_WINDOWS@