ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-13 00:24:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

- get rid of vm_none

Browse source 
- if VM_PPC is set compiled vm support is enabled on ppc (default off atm)
This commit is contained in:
Ludwig Nussel 2005-10-09 13:07:54 +00:00
parent 44f5273e02
commit b1ea2ed136
1 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
code/unix/Makefile
View file

@ -85,6 +85,7 @@ VERSION=$(shell grep Q3_VERSION ../game/q_shared.h | \
## Defaults ## Defaults
DLL_ONLY=false DLL_ONLY=false
USE_SDL=true USE_SDL=true
VM_PPC=
# bk010215 - TODO - add all defaults / kill Ryan # bk010215 - TODO - add all defaults / kill Ryan
@ -107,10 +108,6 @@ ifeq ($(PLATFORM),linux)
else else
ifeq ($(ARCH),s390x) ifeq ($(ARCH),s390x)
LIB=lib64 LIB=lib64
else
ifeq ($(ARCH),ppc)
VM_PPC=vm_none
endif
endif endif
endif endif
endif endif
@ -132,21 +129,23 @@ ifeq ($(PLATFORM),linux)
OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer \ OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer \
-fno-strict-aliasing -fno-strict-aliasing
BASE_CFLAGS += -DHAVE_VM_NATIVE
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -falign-loops=2 \ OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -falign-loops=2 \
-falign-jumps=2 -falign-functions=2 -fstrength-reduce \ -falign-jumps=2 -falign-functions=2 -fstrength-reduce \
-fno-strict-aliasing -fno-strict-aliasing
BASE_CFLAGS += -DHAVE_VM_NATIVE
else else
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)
OPTIMIZE = -O3 -march=i686 -fomit-frame-pointer -ffast-math \ OPTIMIZE = -O3 -march=i686 -fomit-frame-pointer -ffast-math \
-falign-loops=2 -falign-jumps=2 -falign-functions=2 \ -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
-fno-strict-aliasing -fstrength-reduce -fno-strict-aliasing -fstrength-reduce
BASE_CFLAGS += -DHAVE_VM_NATIVE -DHAVE_VM_COMPILED BASE_CFLAGS += -DHAVE_VM_COMPILED
else else
ifeq ($(ARCH),ppc) ifeq ($(ARCH),ppc)
BASE_CFLAGS += -DHAVE_VM_NATIVE ifneq ($(VM_PPC),)
BASE_CFLAGS += -DHAVE_VM_COMPILED
endif
endif endif
endif endif
endif endif
@ -618,12 +617,8 @@ ifeq ($(ARCH),x86)
Q3OBJ += $(B)/client/vm_x86.o Q3OBJ += $(B)/client/vm_x86.o
endif endif
ifeq ($(ARCH),x86_64)
Q3OBJ += $(B)/client/vm_none.o
endif
ifeq ($(ARCH),ppc) ifeq ($(ARCH),ppc)
ifeq ($(DLL_ONLY),false) ifneq ($(VM_PPC),)
Q3OBJ += $(B)/client/$(VM_PPC).o Q3OBJ += $(B)/client/$(VM_PPC).o
endif endif
endif endif
@ -905,8 +900,9 @@ $(B)/client/win_wndproc.o : $(W32DIR)/win_wndproc.c; $(DO_CC) $(DX_CFLAGS)
$(B)/client/win_resource.o : $(W32DIR)/winquake.rc; $(DO_WINDRES) $(B)/client/win_resource.o : $(W32DIR)/winquake.rc; $(DO_WINDRES)
$(B)/client/vm_x86.o : $(CMDIR)/vm_x86.c; $(DO_CC) $(B)/client/vm_x86.o : $(CMDIR)/vm_x86.c; $(DO_CC)
$(B)/client/vm_none.o : $(CMDIR)/vm_none.c; $(DO_CC) ifneq ($(VM_PPC),)
$(B)/client/$(VM_PPC).o : $(CMDIR)/$(VM_PPC).c; $(DO_CC) $(B)/client/$(VM_PPC).o : $(CMDIR)/$(VM_PPC).c; $(DO_CC)
endif
$(B)/client/unzip.o : $(CMDIR)/unzip.c; $(DO_CC) $(B)/client/unzip.o : $(CMDIR)/unzip.c; $(DO_CC)
$(B)/client/vm.o : $(CMDIR)/vm.c; $(DO_CC) $(B)/client/vm.o : $(CMDIR)/vm.c; $(DO_CC)
@ -991,12 +987,8 @@ ifeq ($(ARCH),i386)
Q3DOBJ += $(B)/ded/vm_x86.o $(B)/ded/ftola.o $(B)/ded/snapvectora.o Q3DOBJ += $(B)/ded/vm_x86.o $(B)/ded/ftola.o $(B)/ded/snapvectora.o
endif endif
ifeq ($(ARCH),x86_64)
Q3DOBJ += $(B)/ded/vm_none.o
endif
ifeq ($(ARCH),ppc) ifeq ($(ARCH),ppc)
ifeq ($(DLL_ONLY),false) ifneq ($(VM_PPC),)
Q3DOBJ += $(B)/ded/$(VM_PPC).o Q3DOBJ += $(B)/ded/$(VM_PPC).o
endif endif
endif endif
@ -1075,8 +1067,9 @@ $(B)/ded/ftola.o : $(UDIR)/ftola.s; $(DO_AS)
$(B)/ded/snapvectora.o : $(UDIR)/snapvectora.s; $(DO_AS) $(B)/ded/snapvectora.o : $(UDIR)/snapvectora.s; $(DO_AS)
$(B)/ded/vm_x86.o : $(CMDIR)/vm_x86.c; $(DO_DED_CC) $(B)/ded/vm_x86.o : $(CMDIR)/vm_x86.c; $(DO_DED_CC)
$(B)/ded/vm_none.o : $(CMDIR)/vm_none.c; $(DO_DED_CC) ifneq ($(VM_PPC),)
$(B)/ded/$(VM_PPC).o : $(CMDIR)/$(VM_PPC).c; $(DO_DED_CC) $(B)/ded/$(VM_PPC).o : $(CMDIR)/$(VM_PPC).c; $(DO_DED_CC)
endif