X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=makefile;h=a9957d2943fa4fa896d5c86773e37c3c4dcb221f;hb=757714edd1100cfbe4dd5c46e4eff480ee25dd3d;hp=4b5bfdf8fb3dc8aafc3263df065a82eff9c5fd80;hpb=43a80363f784b8dc10e438024149da0d993c7eca;p=thunder diff --git a/makefile b/makefile old mode 100755 new mode 100644 index 4b5bfdf..a9957d2 --- a/makefile +++ b/makefile @@ -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"