fix bug that breaks MATLAB 2014a compilation
authorRoss Girshick <rbg@eecs.berkeley.edu>
Tue, 15 Jul 2014 00:04:43 +0000 (17:04 -0700)
committerRoss Girshick <rbg@eecs.berkeley.edu>
Tue, 15 Jul 2014 00:04:43 +0000 (17:04 -0700)
Makefile

index 00f67c9..855d948 100644 (file)
--- 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)