From 106484b1a769ae9382323b7db7293a12cacf1461 Mon Sep 17 00:00:00 2001
From: ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Sat, 29 Oct 2005 17:41:17 +0000
Subject: add HAVE_VM_COMPILED variable so one can override it in
 Makefile.local

git-svn-id: svn://svn.icculus.org/quake3/trunk@197 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 code/unix/Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'code/unix')

diff --git a/code/unix/Makefile b/code/unix/Makefile
index 1b3a21d..3eaa504 100644
--- a/code/unix/Makefile
+++ b/code/unix/Makefile
@@ -123,25 +123,27 @@ ifeq ($(PLATFORM),linux)
     OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -falign-loops=2 \
       -falign-jumps=2 -falign-functions=2 -fstrength-reduce \
       -fno-strict-aliasing
-    # comment out below line to enable the
     # experimental x86_64 jit compiler! you need as
-    BASE_CFLAGS += -DNO_VM_COMPILED
+    #HAVE_VM_COMPILED = true
   else
   ifeq ($(ARCH),i386)
     OPTIMIZE = -O3 -march=i686 -fomit-frame-pointer -ffast-math \
       -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
       -fno-strict-aliasing -fstrength-reduce
+    HAVE_VM_COMPILED=true
   else
   ifeq ($(ARCH),ppc)
-    ifeq ($(VM_PPC),)
-      BASE_CFLAGS += -DNO_VM_COMPILED
+    ifneq ($(VM_PPC),)
+      HAVE_VM_COMPILED=true
     endif
-  else
-    BASE_CFLAGS += -DNO_VM_COMPILED
   endif
   endif
   endif
 
+  ifneq ($(HAVE_VM_COMPILED),true)
+    BASE_CFLAGS += -DNO_VM_COMPILED
+  endif
+
   DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
 
   RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
-- 
cgit v1.2.3