From 21f5cf90d6d37bb6ad3505b6aeb87d0bb2f685f2 Mon Sep 17 00:00:00 2001 From: Jan Hermann Date: Thu, 18 Feb 2021 11:35:47 +0100 Subject: [PATCH] test with Matlab R2020b --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index dae06e2..adc36e3 100644 --- a/Makefile +++ b/Makefile @@ -2,21 +2,22 @@ CC ?= c++ CXX ?= c++ LD ?= c++ MEX ?= mex +CFLAGS ?= -DMX_COMPAT_32 mexext := $(shell mexext) -all: xml2struct.${mexext} +all: xml2struct.$(mexext) -xml2struct.${mexext}: xml2struct.cc | rapidxml - $(MEX) CC=${CC} CXX=${CXX} LD=${LD} -I./rapidxml $< +xml2struct.$(mexext): xml2struct.cc | rapidxml + $(MEX) $(CFLAGS) CC=$(CC) CXX=$(CXX) LD=$(LD) -I./rapidxml $< rapidxml: mkdir -p rapidxml && wget -O - http://iweb.dl.sourceforge.net/project/rapidxml/rapidxml/rapidxml%201.13/rapidxml-1.13.zip | tar -C rapidxml -zx --strip-components 1 clean: - -rm *.${mexext} + rm -f *.$(mexext) distclean: clean - -rm -r rapidxml + rm -rf rapidxml test: - matlab -nojvm -r "tic; disp(xml2struct('test.xml')); toc; exit" + matlab -nodisplay -nojvm -r "tic; disp(xml2struct('test.xml')); toc; exit"