r147 - in trunk/code/tools: asm lcc

[DONOTREPLY at icculus.org]

Author: tma
Date: 2005-10-06 21:03:49 -0400 (Thu, 06 Oct 2005)
New Revision: 147

Modified:
   trunk/code/tools/asm/cmdlib.c
   trunk/code/tools/lcc/makefile
Log:
* Patch from Andreas Kohn to fix q3asm build on FreeBSD
* Removal of SYSTEM variable from the lcc makefile due to problems with FreeBSD


Modified: trunk/code/tools/asm/cmdlib.c
===================================================================
--- trunk/code/tools/asm/cmdlib.c	2005-10-06 15:33:54 UTC (rev 146)
+++ trunk/code/tools/asm/cmdlib.c	2005-10-07 01:03:49 UTC (rev 147)
@@ -28,16 +28,12 @@
 #ifdef WIN32
 #include <direct.h>
 #include <windows.h>
-#endif
-
-#ifdef __linux
+#elif defined(NeXT)
+#include <libc.h>
+#else
 #include <unistd.h>
 #endif
 
-#ifdef NeXT
-#include <libc.h>
-#endif
-
 #define	BASEDIRNAME	"quake"		// assumed to have a 2 or 3 following
 #define PATHSEPERATOR   '/'
 

Modified: trunk/code/tools/lcc/makefile
===================================================================
--- trunk/code/tools/lcc/makefile	2005-10-06 15:33:54 UTC (rev 146)
+++ trunk/code/tools/lcc/makefile	2005-10-07 01:03:49 UTC (rev 147)
@@ -140,10 +140,8 @@
 
 $(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)