From ffbf946dd63dccf0d6b6553c8bc1c9da4d3c89b3 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sun, 15 Jul 2007 14:15:41 +0000 Subject: * Merge of ioq3-r1112 --- src/tools/asm/Makefile | 4 ++-- src/tools/asm/cmdlib.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/tools') diff --git a/src/tools/asm/Makefile b/src/tools/asm/Makefile index df355719..52f1060d 100644 --- a/src/tools/asm/Makefile +++ b/src/tools/asm/Makefile @@ -28,9 +28,9 @@ ifeq ($(USE_CCACHE),1) CXX := ccache $(CXX) endif -default: q3asm +default: q3asm -q3asm: q3asm.c cmdlib.c +q3asm: q3asm.c cmdlib.c $(CC) $(Q3ASM_CFLAGS) -o $@ $^ clean: diff --git a/src/tools/asm/cmdlib.c b/src/tools/asm/cmdlib.c index 4eece87f..69ce3ffd 100644 --- a/src/tools/asm/cmdlib.c +++ b/src/tools/asm/cmdlib.c @@ -313,7 +313,7 @@ char *ExpandArg (const char *path) char *ExpandPath (const char *path) { static char full[1024]; - if (!qdir) + if (!qdir[0]) Error ("ExpandPath called without qdir set"); if (path[0] == '/' || path[0] == '\\' || path[1] == ':') { strcpy( full, path ); @@ -326,7 +326,7 @@ char *ExpandPath (const char *path) char *ExpandGamePath (const char *path) { static char full[1024]; - if (!qdir) + if (!qdir[0]) Error ("ExpandGamePath called without qdir set"); if (path[0] == '/' || path[0] == '\\' || path[1] == ':') { strcpy( full, path ); -- cgit