commit 1162f1829ed7af5d4bdfde890480c8b9136e03e4
author Josh Coalson <jcoalson@users.sourceforce.net> Tue Jun 19 06:48:21 2001 +0000
committer Josh Coalson <jcoalson@users.sourceforce.net> Tue Jun 19 06:48:21 2001 +0000
tree b3b9ee11d872f9059c540d8363e58bf81621aeac
parent 04d1aa35538844693ec940b62194a51495bd65a7

minor fixes

build/exe.mk

diff --git a/build/exe.mk b/build/exe.mk
index 369464d..18e6e8f 100644
--- a/build/exe.mk
+++ b/build/exe.mk
@@ -30,8 +30,8 @@
 
 all : release
 
-debug   : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION="1.0devel" $(DEFINES) $(INCLUDES)
-release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -DVERSION="1.0devel" $(DEFINES) $(INCLUDES)
+debug   : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=\"1.0devel\" $(DEFINES) $(INCLUDES)
+release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -DVERSION=\"1.0devel\" $(DEFINES) $(INCLUDES)
 
 LFLAGS  = -L$(LIBPATH)
 
@@ -47,7 +47,7 @@
 	$(CC) $(CFLAGS) -E $< -o $@
 
 %.o : %.nasm
-	$(NASM) -f elf -d ELF -i ia32/ $< -o $@
+	$(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ $< -o $@
 
 .PHONY : clean
 clean :