mirror of
https://github.com/nasa/trick.git
synced 2024-12-29 17:38:54 +00:00
Updated Makefile.common to include /build in include paths
This commit is contained in:
parent
6aa4ef6c2b
commit
61c2fdbed3
@ -97,7 +97,7 @@ endif
|
||||
TRICK_INCLUDES := -isystem${TRICK_HOME}/trick_source -isystem${TRICK_HOME}/include -isystem${TRICK_HOME}/include/trick/compat
|
||||
TRICK_VERSIONS := -DTRICK_VER=$(TRICK_MAJOR) -DTRICK_MINOR=$(TRICK_MINOR)
|
||||
|
||||
export TRICK_SYSTEM_CXXFLAGS := $(TRICK_INCLUDES) $(TRICK_VERSIONS) -fpic $(UDUNITS_INCLUDES)
|
||||
export TRICK_SYSTEM_CXXFLAGS := $(TRICK_INCLUDES) $(TRICK_VERSIONS) -fpic $(UDUNITS_INCLUDES) -I${TRICK_HOME}/build
|
||||
export TRICK_SYSTEM_SFLAGS := -I${TRICK_HOME}/share/trick -I${TRICK_HOME}/share $(TRICK_INCLUDES) $(TRICK_VERSIONS)
|
||||
|
||||
HAVE_ZEROCONF ?= 0
|
||||
@ -107,7 +107,7 @@ endif
|
||||
|
||||
ifeq ($(USE_ER7_UTILS),ON)
|
||||
ER7_UTILS_HOME := $(TRICK_HOME)/trick_source/er7_utils
|
||||
TRICK_SYSTEM_CXXFLAGS += -DUSE_ER7_UTILS_INTEGRATORS
|
||||
TRICK_SYSTEM_CXXFLAGS += -DUSE_ER7_UTILS_INTEGRATORS
|
||||
TRICK_LIBS += -ler7_utils
|
||||
ifneq ($(wildcard ${ER7_UTILS_HOME}/CheckpointHelper),)
|
||||
USE_ER7_UTILS_CHECKPOINTHELPER = 1
|
||||
|
Loading…
Reference in New Issue
Block a user