From: U-MIKSAN\shamus <shamus@DESKTOP-6PN9E2O.MIKSAN.local>
Date: Fri, 11 Jan 2019 18:52:35 +0000 (-0600)
Subject: Fixes for compilation under MinGW.
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=thunder;a=commitdiff_plain;h=05364bd7d67b04adaee47006b45933b0b758ab18

Fixes for compilation under MinGW.
---

diff --git a/makefile b/makefile
index fdf79bc..11b7da9 100644
--- a/makefile
+++ b/makefile
@@ -12,8 +12,9 @@ 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
 
@@ -81,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.
diff --git a/src/gui.h b/src/gui.h
index a5d4c6f..bc3ed2e 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -9,7 +9,7 @@
 #define __GUI_H__
 
 #include <stdint.h>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 // Message macros
 
diff --git a/src/screen.h b/src/screen.h
index bc1e2ec..01e1660 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -8,7 +8,7 @@
 #ifndef __SCREEN_H__
 #define __SCREEN_H__
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <stdint.h>
 
 void BlitChar(uint8_t *, uint8_t *);
diff --git a/src/sound.cpp b/src/sound.cpp
index e366830..8d87ad9 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -12,7 +12,7 @@
 //
 
 #include "sound.h"
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include "psg.h"
 #include "resource.h"
 #include "ym2151.h"
diff --git a/src/thunder.cpp b/src/thunder.cpp
index bd0cc85..f53dd68 100644
--- a/src/thunder.cpp
+++ b/src/thunder.cpp
@@ -16,7 +16,7 @@
 
 #define THUNDER_VERSION		"1.2.0"
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <string>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/video.h b/src/video.h
index 8e59dfb..b3afeaf 100644
--- a/src/video.h
+++ b/src/video.h
@@ -5,7 +5,7 @@
 #ifndef __VIDEO_H__
 #define __VIDEO_H__
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <stdint.h>							// For uint32_t
 
 #define VIRTUAL_SCREEN_WIDTH	288