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

Merge branch 'master' of http://shamusworld.gotdns.org/git/thunder

diff --git a/makefile b/makefile
index 5f2d1b615e7c5735b7282edbc2d329257affb197..722d9831a1222d9c7251bd0e3b2c6a6b1d271fa7 100644 (file)
--- 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 6dfb03f72270113d17a3c526f2e56eb667255f6b..4a472c9d476a4ce8b213c50a2ff683597d7f930c 100644 (file)
--- a/src/gui.h
+++ b/src/gui.h
@@ -8,7 +8,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 bc1e2ec53763e03899e7a92d3697b5a18aab10de..01e166083db25d7c930534ff9c4a06ae62a7eaef 100644 (file)
--- 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 f2af13a3a07ba5bca5a2a5749847493a67a626cb..27d7a3903b04246fee8c97e76b465f8071a4d040 100644 (file)
--- 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 2914a96c5ae80eab26a7347e3e388609e6aa77ca..9a06f3f60183ee9dd6024d7072a2bc36065f93dd 100644 (file)
--- a/src/thunder.cpp
+++ b/src/thunder.cpp
@@ -17,7 +17,7 @@
 
 #define THUNDER_VERSION                "1.2.1"
 
-#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 acacc76945cb4946bdad148a6b012c29bb6efc0d..8d1847ec29a52227c5e7ee0fa579e81984e03943 100644 (file)
--- a/src/video.h
+++ b/src/video.h
@@ -4,7 +4,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