Added save states; updated application icon.

[thunder] / makefile

diff --git a/makefile b/makefile
old mode 100755 (executable)
new mode 100644 (file)
index e9dc6f1..5211ee3
--- a/makefile
+++ b/makefile
@@ -1,12 +1,12 @@
 #
 # 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
 #
 
-ifeq "$(OSTYPE)" "msys"                                                        # Win32
+ifeq "$(OSTYPE)" "msys"        # Win32
 
 SYSTYPE    = __GCCWIN32__
 EXESUFFIX  = .exe
@@ -26,7 +26,7 @@ ICON       =
 SDLLIBTYPE = --static-libs
 MSG        = Mac OS X
 
-else                                                                                   # *nix
+else   # *nix
 
 SYSTYPE    = __GCCUNIX__
 EXESUFFIX  =
@@ -42,29 +42,35 @@ CC         = gcc
 LD         = gcc
 TARGET     = thunder
 
-CFLAGS   = -MMD -Wall -Wno-switch -Wno-uninitialized -Wno-unused -O2 -D$(SYSTYPE) -fomit-frame-pointer `sdl-config --cflags`
+CFLAGS   = -MMD -Wall -Wno-switch -Wno-uninitialized -Wno-unused -O2 -D$(SYSTYPE) -fomit-frame-pointer `sdl2-config --cflags`
 CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -Wno-uninitialized -Wno-unused -O2 -D$(SYSTYPE) \
-               -fomit-frame-pointer `sdl-config --cflags` \
+               -fomit-frame-pointer `sdl2-config --cflags` \
                -g
 #              -DLOG_UNMAPPED_MEMORY_ACCESSES
 
 LDFLAGS =
 
-# Ugh, let's get rid of the ref to -lcurses
-LIBS = -L/usr/local/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB) -lcurses
+# Ugh, let's get rid of the ref to -lcurses [DONE]
+LIBS = `sdl2-config $(SDLLIBTYPE)` -lstdc++ -lz -lm $(GLLIB)
 
-INCS = -I. -Isrc -I/usr/local/include
+INCS = -I. -Isrc
 
 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  \
+       obj/dis63701.o   \
+       obj/dis6809.o    \
+       obj/fileio.o     \
+       obj/gui.o        \
+       obj/icon-64x64.o \
+       obj/log.o        \
+       obj/psg.o        \
+       obj/resource.o   \
+       obj/screen.o     \
+       obj/sound.o      \
+       obj/v63701.o     \
+       obj/v6809.o      \
+       obj/video.o      \
+       obj/ym2151.o     \
+       obj/thunder.o    \
        $(ICON)
 
 all: checkenv message obj $(TARGET)$(EXESUFFIX)
@@ -76,7 +82,7 @@ all: checkenv message obj $(TARGET)$(EXESUFFIX)
 checkenv:
        @echo
        @echo -en "\033[01;33m***\033[00;32m Checking compilation environment... \033[00m"
-ifeq "" "$(shell which sdl-config)"
+ifeq "" "$(shell which sdl2-config)"
        @echo
        @echo
        @echo -e "\033[01;33mIt seems that you don't have the SDL development libraries installed.
@@ -120,9 +126,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"