Final fixes for git pull/push kerfuffle. :-P

[thunder] / makefile

diff --git a/makefile b/makefile
index a3820002c2ea730d8056fe7c06b3d9ec390860d8..9c3d85ec4efb670b3e105fcd747c8cb53e90079f 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6,7 +6,7 @@
 # This software is licensed under the GPL v3 or later
 #
 
-ifeq "$(OSTYPE)" "msys"                                                        # Win32
+ifeq "$(OSTYPE)" "msys"        # Win32
 
 SYSTYPE    = __GCCWIN32__
 EXESUFFIX  = .exe
@@ -61,6 +61,7 @@ OBJS = \
        obj/gui.o        \
        obj/icon-64x64.o \
        obj/log.o        \
+       obj/psg.o        \
        obj/resource.o   \
        obj/screen.o     \
        obj/sound.o      \
@@ -80,7 +81,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.