Oops, forgot to pull first before the changes. :-P

[thunder] / makefile

diff --git a/makefile b/makefile
index a3820002c2ea730d8056fe7c06b3d9ec390860d8..722d9831a1222d9c7251bd0e3b2c6a6b1d271fa7 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6,14 +6,15 @@
 # This software is licensed under the GPL v3 or later
 #
 
-ifeq "$(OSTYPE)" "msys"                                                        # Win32
+ifeq "$(OSTYPE)" "msys"        # Win32
 
 SYSTYPE    = __GCCWIN32__
 EXESUFFIX  = .exe
 GLLIB      = -lopengl32
 ICON       = obj/icon.o
-SDLLIBTYPE = --libs
+SDLLIBTYPE = --static-libs
 MSG        = Win32 on MinGW
+EXTRA      = -static
 
 else
 #ifeq "$(OSTYPE)" "darwin"
@@ -51,7 +52,7 @@ CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -Wno-uninitialized -Wno-
 LDFLAGS =
 
 # Ugh, let's get rid of the ref to -lcurses [DONE]
-LIBS = `sdl2-config $(SDLLIBTYPE)` -lstdc++ -lz -lm $(GLLIB)
+LIBS = `sdl2-config $(SDLLIBTYPE)` -lstdc++ -lz -lm $(GLLIB) $(EXTRA)
 
 INCS = -I. -Isrc
 
@@ -61,6 +62,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 +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.