Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: vlfeat/vlfeat
base: master
...
head fork: migurski/vlfeat
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Commits on Mar 02, 2010
Michal Migurski Provisionally added ARM architecture to Makefile
fa72c14
Commits on Mar 05, 2010
Michal Migurski Removed offending MEX dependency and fixed some ARM details
3340e74
Showing with 15 additions and 1 deletion.
  1. +15 −1 Makefile
View
16 Makefile
@@ -150,6 +150,7 @@ Linux_i386_ARCH := glx
Linux_i686_ARCH := glx
Linux_unknown_ARCH := glx
Linux_x86_64_ARCH := a64
+Linux_armv5tel_ARCH := arm
UNAME := $(shell uname -sm)
ARCH ?= $($(shell echo "$(UNAME)" | tr \ _)_ARCH)
@@ -318,6 +319,19 @@ MEX_CFLAGS +=
MEX_LDFLAGS += -Wl,--rpath,\\\$$ORIGIN/
endif
+# SheevaPlug ARM
+ifeq ($(ARCH),arm)
+BINDIR := $(VLDIR)/bin/arm
+MEX_SUFFIX := mexglx
+DLL_SUFFIX := so
+C_CFLAGS += -D__LITTLE_ENDIAN__ -std=c99
+C_CFLAGS += -march=armv5te
+LDFLAGS += -lm -Wl,--rpath,\$$ORIGIN/
+MEX_FLAGS += -lm
+MEX_CFLAGS +=
+MEX_LDFLAGS += -Wl,--rpath,\\\$$ORIGIN/
+endif
+
DIST := $(NAME)-$(VER)
BINDIST := $(DIST)-bin
MEX_BINDIR := $(VLDIR)/toolbox/$(MEX_SUFFIX)
@@ -673,7 +687,7 @@ post-doc: doc
# Auto-deps
ifeq ($(filter doc clean archclean distclean info \
bin-release bin-commit bin-merge bin-dist, $(MAKECMDGOALS)),)
-include $(dll_dep) $(bin_dep) $(mex_dep)
+include $(dll_dep) $(bin_dep)
endif
# Makefile for documentation

No commit comments for this range

Something went wrong with that request. Please try again.