aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-11-10 09:46:41 +0000
committerludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-11-10 09:46:41 +0000
commita5456e606d6cb9fd09e7a1ce8b5c8fa7386c9b13 (patch)
tree7d911a579d88a84a45239c8e379f53e7167f0605
parent77fb1bfc35a629df2071d5eb4ea5f82505904586 (diff)
downloadioquake3-aero-a5456e606d6cb9fd09e7a1ce8b5c8fa7386c9b13.tar.gz
ioquake3-aero-a5456e606d6cb9fd09e7a1ce8b5c8fa7386c9b13.zip
enable new powerpc vm
Patch by Przemysław Iskra (#3796) git-svn-id: svn://svn.icculus.org/quake3/trunk@1484 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--Makefile22
1 files changed, 19 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 2b0933a..f340753 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,9 @@ export PLATFORM
ifeq ($(COMPILE_ARCH),powerpc)
COMPILE_ARCH=ppc
endif
+ifeq ($(COMPILE_ARCH),powerpc64)
+ COMPILE_ARCH=ppc64
+endif
ifndef ARCH
ARCH=$(COMPILE_ARCH)
@@ -272,7 +275,11 @@ ifeq ($(PLATFORM),linux)
else
ifeq ($(ARCH),ppc)
BASE_CFLAGS += -maltivec
- HAVE_VM_COMPILED=false
+ HAVE_VM_COMPILED=true
+ endif
+ ifeq ($(ARCH),ppc64)
+ BASE_CFLAGS += -maltivec
+ HAVE_VM_COMPILED=true
endif
endif
endif
@@ -343,6 +350,9 @@ ifeq ($(PLATFORM),darwin)
BASE_CFLAGS += -faltivec
OPTIMIZE += -O3
endif
+ ifeq ($(ARCH),ppc64)
+ BASE_CFLAGS += -faltivec
+ endif
ifeq ($(ARCH),i386)
OPTIMIZE += -march=prescott -mfpmath=sse
# x86 vm will crash without -mstackrealign since MMX instructions will be
@@ -1429,7 +1439,10 @@ ifeq ($(HAVE_VM_COMPILED),true)
Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
endif
ifeq ($(ARCH),ppc)
- Q3OBJ += $(B)/client/vm_ppc.o
+ Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o
+ endif
+ ifeq ($(ARCH),ppc64)
+ Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o
endif
endif
@@ -1572,7 +1585,10 @@ ifeq ($(HAVE_VM_COMPILED),true)
Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o
endif
ifeq ($(ARCH),ppc)
- Q3DOBJ += $(B)/ded/vm_ppc.o
+ Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o
+ endif
+ ifeq ($(ARCH),ppc64)
+ Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o
endif
endif