Code cleanup/removal of cruft.

[thunder] / makefile

diff --git a/makefile b/makefile
index 5f21739a3166d32efce6917134965686df2a613e..fdf79bca85a29cf4a8cfc85ee1932b5138ae170b 100644 (file)
--- a/makefile
+++ b/makefile
@@ -42,29 +42,34 @@ 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/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)