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

refactor platform specific stuff a bit

Browse source
This commit is contained in:
Ludwig Nussel 2006-06-06 18:09:09 +00:00
parent 99abd01c2f
commit eaa8f1c989
1 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
Makefile
View file

@ -373,6 +373,8 @@ ifeq ($(PLATFORM),mingw32)
OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math -falign-loops=2 \ OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math -falign-loops=2 \
-funroll-loops -falign-jumps=2 -falign-functions=2 -fstrength-reduce -funroll-loops -falign-jumps=2 -falign-functions=2 -fstrength-reduce
HAVE_VM_COMPILED = true
DEBUG_CFLAGS=$(BASE_CFLAGS) -g -O0 DEBUG_CFLAGS=$(BASE_CFLAGS) -g -O0
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
@ -904,7 +906,6 @@ Q3OBJ = \
$(B)/client/tr_world.o \ $(B)/client/tr_world.o \
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)
Q3OBJ += $(B)/client/vm_x86.o
Q3OBJ += \ Q3OBJ += \
$(B)/client/snd_mixa.o \ $(B)/client/snd_mixa.o \
$(B)/client/matha.o \ $(B)/client/matha.o \
@ -912,19 +913,24 @@ ifeq ($(ARCH),i386)
$(B)/client/snapvectora.o $(B)/client/snapvectora.o
endif endif
ifeq ($(ARCH),x86) ifeq ($(ARCH),x86)
Q3OBJ += $(B)/client/vm_x86.o
Q3OBJ += \ Q3OBJ += \
$(B)/client/snd_mixa.o \ $(B)/client/snd_mixa.o \
$(B)/client/matha.o \ $(B)/client/matha.o \
$(B)/client/ftola.o \ $(B)/client/ftola.o \
$(B)/client/snapvectora.o $(B)/client/snapvectora.o
endif endif
ifeq ($(ARCH),x86_64)
Q3OBJ += $(B)/client/vm_x86_64.o
endif
ifeq ($(ARCH),ppc) ifeq ($(HAVE_VM_COMPILED),true)
ifneq ($(VM_PPC),) ifeq ($(ARCH),i386)
Q3OBJ += $(B)/client/vm_x86.o
endif
ifeq ($(ARCH),x86)
Q3OBJ += $(B)/client/vm_x86.o
endif
ifeq ($(ARCH),x86_64)
Q3OBJ += $(B)/client/vm_x86_64.o
endif
ifeq ($(ARCH),ppc)
Q3OBJ += $(B)/client/$(VM_PPC).o Q3OBJ += $(B)/client/$(VM_PPC).o
endif endif
endif endif
@ -1249,16 +1255,23 @@ Q3DOBJ = \
$(B)/ded/null_snddma.o $(B)/ded/null_snddma.o
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)
Q3DOBJ += $(B)/ded/vm_x86.o $(B)/ded/ftola.o \ Q3DOBJ += \
$(B)/ded/snapvectora.o $(B)/ded/matha.o $(B)/ded/ftola.o \
$(B)/ded/snapvectora.o \
$(B)/ded/matha.o
endif endif
ifeq ($(ARCH),x86_64) ifeq ($(HAVE_VM_COMPILED),true)
Q3DOBJ += $(B)/ded/vm_x86_64.o ifeq ($(ARCH),i386)
endif Q3DOBJ += $(B)/ded/vm_x86.o
endif
ifeq ($(ARCH),ppc) ifeq ($(ARCH),x86)
ifneq ($(VM_PPC),) Q3DOBJ += $(B)/ded/vm_x86.o
endif
ifeq ($(ARCH),x86_64)
Q3DOBJ += $(B)/ded/vm_x86_64.o
endif
ifeq ($(ARCH),ppc)
Q3DOBJ += $(B)/ded/$(VM_PPC).o Q3DOBJ += $(B)/ded/$(VM_PPC).o
endif endif
endif endif