diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-10-07 01:03:49 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-10-07 01:03:49 +0000 |
| commit | aae027c11a995a15038b6410eb85ea6ccc6508f5 (patch) | |
| tree | ac3ad3c636e4b0258528bd016b76d0865ba643b0 /code | |
| parent | 29d686a3c6474c3ef17169319a169fd741fb66fb (diff) | |
| download | ioquake3-aero-aae027c11a995a15038b6410eb85ea6ccc6508f5.tar.gz ioquake3-aero-aae027c11a995a15038b6410eb85ea6ccc6508f5.zip | |
* Patch from Andreas Kohn to fix q3asm build on FreeBSD
* Removal of SYSTEM variable from the lcc makefile due to problems with FreeBSD
git-svn-id: svn://svn.icculus.org/quake3/trunk@147 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code')
| -rw-r--r-- | code/tools/asm/cmdlib.c | 10 | ||||
| -rw-r--r-- | code/tools/lcc/makefile | 4 |
2 files changed, 4 insertions, 10 deletions
diff --git a/code/tools/asm/cmdlib.c b/code/tools/asm/cmdlib.c index f3d8554..3f1ea3b 100644 --- a/code/tools/asm/cmdlib.c +++ b/code/tools/asm/cmdlib.c @@ -28,14 +28,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #ifdef WIN32 #include <direct.h> #include <windows.h> -#endif - -#ifdef __linux -#include <unistd.h> -#endif - -#ifdef NeXT +#elif defined(NeXT) #include <libc.h> +#else +#include <unistd.h> #endif #define BASEDIRNAME "quake" // assumed to have a 2 or 3 following diff --git a/code/tools/lcc/makefile b/code/tools/lcc/makefile index 6de94eb..a0c9a70 100644 --- a/code/tools/lcc/makefile +++ b/code/tools/lcc/makefile @@ -140,10 +140,8 @@ $(BD)bprint$(O): etc/bprint.c; $(CC) $(LCC_CFLAGS) -c -Isrc -o $@ etc/bprint.c $(BD)q3lcc$(E): $(BD)q3lcc$(O) $(BD)host$(O); $(LD) $(LDFLAGS) -o $@ $(BD)q3lcc$(O) $(BD)host$(O) -SYSTEM=$(shell cc -print-search-dirs | head -n 1 | cut -b 10-) - $(BD)q3lcc$(O): etc/lcc.c; $(CC) $(LCC_CFLAGS) -c -DTEMPDIR=\"$(TEMPDIR)\" -o $@ etc/lcc.c -$(BD)host$(O): $(HOSTFILE); $(CC) $(LCC_CFLAGS) -c -DSYSTEM=\"$(SYSTEM)\" -o $@ $(HOSTFILE) +$(BD)host$(O): $(HOSTFILE); $(CC) $(LCC_CFLAGS) -c -DSYSTEM=\"\" -o $@ $(HOSTFILE) LIBOBJS=$(BD)assert$(O) $(BD)bbexit$(O) $(BD)yynull$(O) |