diff --git a/platypus.mk b/platypus.mk index 31d4a355..1a9ed643 100644 --- a/platypus.mk +++ b/platypus.mk @@ -1,11 +1,9 @@ -MFEM_DIR ?=$(APPLICATION_DIR)/../mfem/build -MFEM_INC_DIR ?=$(MFEM_DIR)/include +MFEM_DIR ?= $(APPLICATION_DIR)/../mfem/installed -MFEM_INCLUDES := -I$(MFEM_DIR)/include -MFEM_LIBS := -Wl,-rpath,$(MFEM_DIR)/lib -L$(MFEM_DIR)/lib -lmfem -lrt -lmfem-common +include $(MFEM_DIR)/share/mfem/config.mk -ADDITIONAL_INCLUDES += $(MFEM_INCLUDES) -ADDITIONAL_LIBS += $(MFEM_LIBS) ${MFEM_EXT_LIBS} +ADDITIONAL_INCLUDES += $(MFEM_INCFLAGS) +ADDITIONAL_LIBS += $(MFEM_LIBS) -lmfem-common $(info ADDITIONAL_INCLUDES = $(ADDITIONAL_INCLUDES)); $(info ADDITIONAL_LIBS = $(ADDITIONAL_LIBS));