diff options
| author | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-10-27 21:13:47 +0000 |
|---|---|---|
| committer | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-10-27 21:13:47 +0000 |
| commit | 163e8dc4db61a3daf608edf693849f99e8f2f7ba (patch) | |
| tree | 59470e599d87ae1b3e2e02ee1c7b01a4f4dfbc39 /code/unix | |
| parent | 712aeab5985ae52245a1b749dfc5f69899ddcd0b (diff) | |
| download | ioquake3-aero-163e8dc4db61a3daf608edf693849f99e8f2f7ba.tar.gz ioquake3-aero-163e8dc4db61a3daf608edf693849f99e8f2f7ba.zip | |
add x86_64 vm. experimental, not enabled by default. you need as for it
to work.
git-svn-id: svn://svn.icculus.org/quake3/trunk@188 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/unix')
| -rw-r--r-- | code/unix/Makefile | 13 | ||||
| -rw-r--r-- | code/unix/unix_main.c | 1 |
2 files changed, 12 insertions, 2 deletions
diff --git a/code/unix/Makefile b/code/unix/Makefile index 71db2bd..5bf4777 100644 --- a/code/unix/Makefile +++ b/code/unix/Makefile @@ -135,6 +135,8 @@ ifeq ($(PLATFORM),linux) OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -falign-loops=2 \ -falign-jumps=2 -falign-functions=2 -fstrength-reduce \ -fno-strict-aliasing +# experimental! you need as +# BASE_CFLAGS += -DHAVE_VM_COMPILED else ifeq ($(ARCH),i386) OPTIMIZE = -O3 -march=i686 -fomit-frame-pointer -ffast-math \ @@ -404,7 +406,7 @@ endif DO_CC=$(CC) $(CFLAGS) -o $@ -c $< DO_CXX=$(CXX) $(CFLAGS) -o $@ -c $< DO_SMP_CC=$(CC) $(CFLAGS) -DSMP -o $@ -c $< -DO_BOT_CC=$(CC) $(CFLAGS) -DBOTLIB -o $@ -c $< # $(SHLIBCFLAGS) # bk001212 +DO_BOT_CC=$(CC) $(CFLAGS) -DBOTLIB -o $@ -c $< # $(SHLIBCFLAGS) # bk001212 DO_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) -o $@ -c $< DO_SHLIB_CC=$(CC) $(CFLAGS) $(SHLIBCFLAGS) -o $@ -c $< DO_SHLIB_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $< @@ -618,6 +620,9 @@ 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) ifneq ($(VM_PPC),) @@ -902,6 +907,7 @@ $(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/vm_x86.o : $(CMDIR)/vm_x86.c; $(DO_CC) +$(B)/client/vm_x86_64.o : $(CMDIR)/vm_x86_64.c; $(DO_CC) ifneq ($(VM_PPC),) $(B)/client/$(VM_PPC).o : $(CMDIR)/$(VM_PPC).c; $(DO_CC) endif @@ -989,6 +995,10 @@ ifeq ($(ARCH),i386) Q3DOBJ += $(B)/ded/vm_x86.o $(B)/ded/ftola.o $(B)/ded/snapvectora.o endif +ifeq ($(ARCH),x86_64) + Q3DOBJ += $(B)/ded/vm_x86_64.o +endif + ifeq ($(ARCH),ppc) ifneq ($(VM_PPC),) Q3DOBJ += $(B)/ded/$(VM_PPC).o @@ -1069,6 +1079,7 @@ $(B)/ded/ftola.o : $(UDIR)/ftola.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_64.o : $(CMDIR)/vm_x86_64.c; $(DO_DED_CC) ifneq ($(VM_PPC),) $(B)/ded/$(VM_PPC).o : $(CMDIR)/$(VM_PPC).c; $(DO_DED_CC) endif diff --git a/code/unix/unix_main.c b/code/unix/unix_main.c index 5c51615..9a38302 100644 --- a/code/unix/unix_main.c +++ b/code/unix/unix_main.c @@ -730,7 +730,6 @@ changed the load procedure to match VFS logic, and allow developer use #3 look in fs_basepath ================= */ -extern char *FS_BuildOSPath( const char *base, const char *game, const char *qpath ); static void* try_dlopen(const char* base, const char* gamedir, const char* fname, char* fqpath ) { |