From: Shamus Hammons <jlhamm@acm.org>
Date: Fri, 13 Jan 2023 17:42:32 +0000 (-0600)
Subject: Final fixes for git pull/push kerfuffle.  :-P
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=thunder;a=commitdiff_plain;h=a046907b274eb0cfa9c10a4c68fb38255f96714c

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

diff --git a/makefile b/makefile
index 722d983..9c3d85e 100644
--- a/makefile
+++ b/makefile
@@ -12,9 +12,8 @@ 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
 
diff --git a/src/gui.h b/src/gui.h
index 4a472c9..6dfb03f 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -8,7 +8,7 @@
 #define __GUI_H__
 
 #include <stdint.h>
-#include <SDL.h>
+#include <SDL2/SDL.h>
 
 // Message macros
 
diff --git a/src/screen.h b/src/screen.h
index 01e1660..bc1e2ec 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -8,7 +8,7 @@
 #ifndef __SCREEN_H__
 #define __SCREEN_H__
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <stdint.h>
 
 void BlitChar(uint8_t *, uint8_t *);
diff --git a/src/sound.cpp b/src/sound.cpp
index 27d7a39..f2af13a 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -12,7 +12,7 @@
 //
 
 #include "sound.h"
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include "psg.h"
 #include "resource.h"
 #include "ym2151.h"
diff --git a/src/thunder.cpp b/src/thunder.cpp
index 9a06f3f..2914a96 100644
--- a/src/thunder.cpp
+++ b/src/thunder.cpp
@@ -17,7 +17,7 @@
 
 #define THUNDER_VERSION		"1.2.1"
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <string>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/video.h b/src/video.h
index 8d1847e..acacc76 100644
--- a/src/video.h
+++ b/src/video.h
@@ -4,7 +4,7 @@
 #ifndef __VIDEO_H__
 #define __VIDEO_H__
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <stdint.h>							// For uint32_t
 
 #define VIRTUAL_SCREEN_WIDTH	288