r197 - trunk/code/unix

[DONOTREPLY at icculus.org]

Author: ludwig
Date: 2005-10-29 13:41:17 -0400 (Sat, 29 Oct 2005)
New Revision: 197

Modified:
   trunk/code/unix/Makefile
Log:
add HAVE_VM_COMPILED variable so one can override it in Makefile.local


Modified: trunk/code/unix/Makefile
===================================================================
--- trunk/code/unix/Makefile	2005-10-29 01:53:09 UTC (rev 196)
+++ trunk/code/unix/Makefile	2005-10-29 17:41:17 UTC (rev 197)
@@ -123,25 +123,27 @@
     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)