diff options
| author | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-06-06 18:09:09 +0000 |
|---|---|---|
| committer | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-06-06 18:09:09 +0000 |
| commit | 25475468b34f883e5349f2e50d180de3718398c7 (patch) | |
| tree | 5816c1f0ca3c1bb99f01fc4bc7354fc1daf9d197 | |
| parent | 3b2cb2af2303bb9bcc07a946846afc59b1f44fe1 (diff) | |
| download | ioquake3-aero-25475468b34f883e5349f2e50d180de3718398c7.tar.gz ioquake3-aero-25475468b34f883e5349f2e50d180de3718398c7.zip | |
refactor platform specific stuff a bit
git-svn-id: svn://svn.icculus.org/quake3/trunk@798 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | Makefile | 43 |
1 files changed, 28 insertions, 15 deletions
@@ -373,6 +373,8 @@ ifeq ($(PLATFORM),mingw32) OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math -falign-loops=2 \ -funroll-loops -falign-jumps=2 -falign-functions=2 -fstrength-reduce + HAVE_VM_COMPILED = true + DEBUG_CFLAGS=$(BASE_CFLAGS) -g -O0 RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) @@ -904,7 +906,6 @@ Q3OBJ = \ $(B)/client/tr_world.o \ ifeq ($(ARCH),i386) - Q3OBJ += $(B)/client/vm_x86.o Q3OBJ += \ $(B)/client/snd_mixa.o \ $(B)/client/matha.o \ @@ -912,19 +913,24 @@ ifeq ($(ARCH),i386) $(B)/client/snapvectora.o endif ifeq ($(ARCH),x86) - Q3OBJ += $(B)/client/vm_x86.o Q3OBJ += \ $(B)/client/snd_mixa.o \ $(B)/client/matha.o \ $(B)/client/ftola.o \ $(B)/client/snapvectora.o endif -ifeq ($(ARCH),x86_64) - Q3OBJ += $(B)/client/vm_x86_64.o -endif -ifeq ($(ARCH),ppc) - ifneq ($(VM_PPC),) +ifeq ($(HAVE_VM_COMPILED),true) + 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 endif endif @@ -1249,16 +1255,23 @@ Q3DOBJ = \ $(B)/ded/null_snddma.o ifeq ($(ARCH),i386) - Q3DOBJ += $(B)/ded/vm_x86.o $(B)/ded/ftola.o \ - $(B)/ded/snapvectora.o $(B)/ded/matha.o + Q3DOBJ += \ + $(B)/ded/ftola.o \ + $(B)/ded/snapvectora.o \ + $(B)/ded/matha.o endif -ifeq ($(ARCH),x86_64) - Q3DOBJ += $(B)/ded/vm_x86_64.o -endif - -ifeq ($(ARCH),ppc) - ifneq ($(VM_PPC),) +ifeq ($(HAVE_VM_COMPILED),true) + ifeq ($(ARCH),i386) + Q3DOBJ += $(B)/ded/vm_x86.o + endif + ifeq ($(ARCH),x86) + 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 endif endif |