diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-25 22:04:51 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-25 22:04:51 +0000 |
| commit | 4a17650af74aa4b90c0c258d3aedff49ab2ac60b (patch) | |
| tree | 63833dadee0795214a880808bae36c7081aaf430 /code/unix | |
| parent | 2202e36a35f4534b340b45b876482b1f6bf2a955 (diff) | |
| download | ioquake3-aero-4a17650af74aa4b90c0c258d3aedff49ab2ac60b.tar.gz ioquake3-aero-4a17650af74aa4b90c0c258d3aedff49ab2ac60b.zip | |
* FreeBSD fixes/updates from Andreas Kohn
git-svn-id: svn://svn.icculus.org/quake3/trunk@107 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/unix')
| -rw-r--r-- | code/unix/Makefile | 30 | ||||
| -rw-r--r-- | code/unix/unix_shared.c | 4 |
2 files changed, 18 insertions, 16 deletions
diff --git a/code/unix/Makefile b/code/unix/Makefile index a344c56..dfcd43f 100644 --- a/code/unix/Makefile +++ b/code/unix/Makefile @@ -317,15 +317,15 @@ ifeq ($(PLATFORM),freebsd) DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror ifeq ($(ARCH),axp) - CC=pgcc + CC=gcc RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \ -fomit-frame-pointer -fexpensive-optimizations else - CC=pgcc + CC=gcc RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \ -march=pentium -fomit-frame-pointer -pipe -ffast-math \ - -malign-loops=2 -malign-jumps=2 -malign-functions=2 \ - -fno-strict-aliasing - fstrength-reduce + -falign-loops=2 -falign-jumps=2 -falign-functions=2 \ + -fno-strict-aliasing -fstrength-reduce endif LIBEXT=a @@ -411,12 +411,6 @@ else # ifeq IRIX ARFLAGS=ar rv RANLIB=ranlib - ifeq ($(PLATFORM),freebsd) - LDFLAGS=-lm - else - LDFLAGS=-ldl -lm - endif # ifeq freebsd - TARGETS=\ $(B)/$(PLATFORM)q3ded @@ -641,6 +635,9 @@ endif #platform specific objects ifeq ($(PLATFORM),freebsd) +ifeq ($(ARCH),axp) + Q3POBJ= +else Q3POBJ=\ $(B)/client/unix_main.o \ $(B)/client/unix_net.o \ @@ -653,9 +650,14 @@ ifeq ($(PLATFORM),freebsd) $(B)/client/linux_snd.o \ $(B)/client/sdl_snd.o \ $(B)/client/snd_mixa.o \ - $(B)/client/matha.o \ - $(B)/client/ftol.o \ - $(B)/client/snapvector.o + $(B)/client/matha.o + + ifeq ($(ARCH),i386) + Q3POBJ += $(B)/client/ftola.o $(B)/client/snapvectora.o + Q3POBJ_SMP += $(B)/client/ftola.o $(B)/client/snapvectora.o + endif + +endif # FreeBSD-axp else ifeq ($(PLATFORM),irix) Q3POBJ=\ @@ -880,7 +882,7 @@ $(B)/client/irix_glimp.o : $(UDIR)/irix_glimp.c; $(DO_CC) $(B)/client/irix_glimp_smp.o : $(UDIR)/irix_glimp.c; $(DO_SMP_CC) $(B)/client/irix_snd.o : $(UDIR)/irix_snd.c; $(DO_CC) $(B)/client/irix_input.o : $(UDIR)/irix_input.c; $(DO_CC) -$(B)/client/linux_signals.o : $(UDIR)/linux_signals.c; $(DO_CC) +$(B)/client/linux_signals.o : $(UDIR)/linux_signals.c; $(DO_CC) $(GL_CFLAGS) $(B)/client/linux_common.o : $(UDIR)/linux_common.c; $(DO_CC) $(B)/client/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) $(GL_CFLAGS) $(B)/client/sdl_glimp.o : $(UDIR)/sdl_glimp.c; $(DO_CC) $(GL_CFLAGS) diff --git a/code/unix/unix_shared.c b/code/unix/unix_shared.c index e3d0dad..b39abc8 100644 --- a/code/unix/unix_shared.c +++ b/code/unix/unix_shared.c @@ -76,7 +76,7 @@ int Sys_Milliseconds (void) return curtime; } -#if defined(__linux__) && !defined(DEDICATED) +#if (defined(__linux__) || defined(__FreeBSD__)) && !defined(DEDICATED) /* ================ Sys_XTimeToSysTime @@ -425,7 +425,7 @@ char *Sys_GetCurrentUser( void ) return p->pw_name; } -#if defined(__linux__) +#if defined(__linux__) || defined(__FreeBSD__) // TTimo // sysconf() in libc, POSIX.1 compliant unsigned int Sys_ProcessorCount(void) |