From c28823f7829b91c5dd56060579dda2cecbc22d7b Mon Sep 17 00:00:00 2001 From: Ross Girshick Date: Mon, 14 Jul 2014 17:04:43 -0700 Subject: [PATCH] fix bug that breaks MATLAB 2014a compilation --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 00f67c9..855d948 100644 --- a/Makefile +++ b/Makefile @@ -336,9 +336,9 @@ $(MAT$(PROJECT)_SO): $(MAT$(PROJECT)_SRC) $(STATIC_NAME) "to build mat$(PROJECT)."; \ exit 1; \ fi - $(MATLAB_DIR)/bin/mex $(MAT$(PROJECT)_SRC) $(STATIC_NAME) \ + $(MATLAB_DIR)/bin/mex $(MAT$(PROJECT)_SRC) \ CXXFLAGS="\$$CXXFLAGS $(MATLAB_CXXFLAGS)" \ - CXXLIBS="\$$CXXLIBS $(LDFLAGS)" -o $@ + CXXLIBS="\$$CXXLIBS $(STATIC_NAME) $(LDFLAGS)" -output $@ @ echo runtest: $(TEST_ALL_BIN) -- 2.7.4