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

[thunder] / makefile

diff --git a/makefile b/makefile
index 11b7da914562fae539cfc2944c05f8ba1bcabaed..9c3d85ec4efb670b3e105fcd747c8cb53e90079f 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6,15 +6,14 @@
 # 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 = --static-libs
+SDLLIBTYPE = --libs
 MSG        = Win32 on MinGW
-EXTRA      = -static
 
 else
 #ifeq "$(OSTYPE)" "darwin"
@@ -52,7 +51,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) $(EXTRA)
+LIBS = `sdl2-config $(SDLLIBTYPE)` -lstdc++ -lz -lm $(GLLIB)
 
 INCS = -I. -Isrc