[ioquake3] 15/25: Merge pull request #91 from lnussel/master

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 6e4e6e8925ee02cad43eaf2cc519c0d730adf142
Merge: bf3c88d 6214f73
Author: Zachary J. Slater <zjs at zacharyjackslater.com>
Date:   Tue Jan 24 19:27:13 2017 -1000

    Merge pull request #91 from lnussel/master
    
    a VM for ARMv7l (Thank you, Ludwig -zjs)

 Makefile                 |   10 +
 code/qcommon/vm_armv7l.c | 1210 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1220 insertions(+)

diff --cc Makefile
index bff7021,ed8dd4d..3876d27
--- a/Makefile
+++ b/Makefile
@@@ -2047,9 -2086,12 +2051,12 @@@ ifeq ($(HAVE_VM_COMPILED),true
    ifeq ($(ARCH),sparc)
      Q3OBJ += $(B)/client/vm_sparc.o
    endif
+   ifeq ($(ARCH),armv7l)
+     Q3OBJ += $(B)/client/vm_armv7l.o
+   endif
  endif
  
 -ifeq ($(PLATFORM),mingw32)
 +ifdef MINGW
    Q3OBJ += \
      $(B)/client/win_resource.o \
      $(B)/client/sys_win32.o
@@@ -2215,9 -2257,12 +2222,12 @@@ ifeq ($(HAVE_VM_COMPILED),true
    ifeq ($(ARCH),sparc)
      Q3DOBJ += $(B)/ded/vm_sparc.o
    endif
+   ifeq ($(ARCH),armv7l)
+     Q3DOBJ += $(B)/client/vm_armv7l.o
+   endif
  endif
  
 -ifeq ($(PLATFORM),mingw32)
 +ifdef MINGW
    Q3DOBJ += \
      $(B)/ded/win_resource.o \
      $(B)/ded/sys_win32.o \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git