X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=makefile;h=5f21739a3166d32efce6917134965686df2a613e;hb=60c8824bffff8513464fec58921fae8b406b7e94;hp=d0f50c77a5ca82642866676960ae870d82af7cb5;hpb=87647f03b4d7cf53948ed8f9f25ad30da5e596bf;p=thunder

diff --git a/makefile b/makefile
old mode 100755
new mode 100644
index d0f50c7..5f21739
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for Thunder SDL
 #
-# by James L. Hammons
+# by James Hammons
 # (C) 2009 Underground Software
 # This software is licensed under the GPL v3 or later
 #
@@ -26,7 +26,7 @@ ICON       =
 SDLLIBTYPE = --static-libs
 MSG        = Mac OS X
 
-else											# *nix
+else	# *nix
 
 SYSTYPE    = __GCCUNIX__
 EXESUFFIX  =
@@ -56,10 +56,13 @@ LIBS = -L/usr/local/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB) -lcurse
 INCS = -I. -Isrc -I/usr/local/include
 
 OBJS = \
+	obj/dis6808.o  \
+	obj/dis6809.o  \
 	obj/gui.o      \
 	obj/log.o      \
 	obj/resource.o \
 	obj/screen.o   \
+	obj/v6808.o    \
 	obj/v6809.o    \
 	obj/thunder.o  \
 	$(ICON)
@@ -117,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"