X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=makefile;fp=makefile;h=a9957d2943fa4fa896d5c86773e37c3c4dcb221f;hb=757714edd1100cfbe4dd5c46e4eff480ee25dd3d;hp=e9dc6f10a72a1cd1b19c9f074ed3c2b790c2efc3;hpb=a82cb4de3c1820fe8a9a8185e55eef94a9f4b079;p=thunder diff --git a/makefile b/makefile old mode 100755 new mode 100644 index e9dc6f1..a9957d2 --- a/makefile +++ b/makefile @@ -120,9 +120,8 @@ obj/%.o: src/%.cpp @$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@ obj/%.o: src/%.asm - nasm -f elf32 -I ./res/ $< -o $@ -# *** sigh *** yet another variable... !!! FIX !!! -# nasm -f coff $< -o $@ + @echo -e "\033[01;33m***\033[00;32m Assembling $<...\033[00m" + @nasm -f elf64 -I ./res/ $< -o $@ $(TARGET)$(EXESUFFIX): $(OBJS) @echo -e "\033[01;33m***\033[00;32m Linking it all together...\033[00m"