Merge pull request #136 from mniip/scons

mingw compiling fixes

3 files changed, 17 insertions, 18 deletions

diff --git a/SConscript b/SConscript
index 1a5576f..d8c13a0 100755
--- a/SConscript
+++ b/SConscript
@@ -74,21 +74,21 @@ if GetOption("toolprefix"):
 #Check for headers and libraries
 if not GetOption("macosx"):
 	conf = Configure(env)
-
-	try:
-		env.ParseConfig('sdl-config --cflags')
-		env.ParseConfig('sdl-config --libs')
-	except:
-		if not conf.CheckLib("SDL"):
-			print "libSDL not found or not installed"
+	if(GetOption("sdl-dir")):
+		if not conf.CheckCHeader(GetOption("sdl-dir") + '/SDL.h'):
+			print "sdl headers not found or not installed"
 			raise SystemExit(1)
-			
-		if(GetOption("sdl-dir")):
-			if not conf.CheckCHeader(GetOption("sdl-dir") + '/SDL.h'):
-				print "sdl headers not found or not installed"
+		else:
+			env.Append(CPPPATH=[GetOption("sdl-dir")])
+	else:
+		try:
+			env.ParseConfig('sdl-config --cflags')
+			env.ParseConfig('sdl-config --libs')
+		except:
+			if not conf.CheckLib("SDL"):
+				print "libSDL not found or not installed"
 				raise SystemExit(1)
-			else:
-				env.Append(CPPPATH=[GetOption("sdl-dir")])
+			
 
 	#Find correct lua include dir
 	if not GetOption("nolua"):
diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp
index f61a55e..94559b2 100644
--- a/src/PowderToySDL.cpp
+++ b/src/PowderToySDL.cpp
@@ -16,8 +16,8 @@
 #include "graphics/Graphics.h"
 #if defined(LIN)
 #include "icon.h"
-#include <signal.h>
 #endif
+#include <signal.h>
 
 #ifndef WIN
 #include <unistd.h>
@@ -786,7 +786,6 @@ int main(int argc, char * argv[])
 	signal(SIGFPE, SigHandler);
 	signal(SIGILL, SigHandler);
 	signal(SIGABRT, SigHandler);
-
 #endif
 
 	GameController * gameController = NULL;
diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp
index 12414c7..883435e 100644
--- a/src/gui/game/GameView.cpp
+++ b/src/gui/game/GameView.cpp
@@ -1212,7 +1212,7 @@ void GameView::BeginStampSelection()
 {
 	selectMode = SelectStamp;
 	selectPoint1 = ui::Point(-1, -1);
-	buttonTip = "\x0F\xEF\xEF\x10\Click-and-drag to specify an area to create a stamp (right click = cancel)";
+	buttonTip = "\x0F\xEF\xEF\020Click-and-drag to specify an area to create a stamp (right click = cancel)";
 	buttonTipShow = 120;
 }
 
@@ -1392,7 +1392,7 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
 		{
 			selectMode = SelectCopy;
 			selectPoint1 = ui::Point(-1, -1);
-			buttonTip = "\x0F\xEF\xEF\x10\Click-and-drag to specify an area to copy (right click = cancel)";
+			buttonTip = "\x0F\xEF\xEF\020Click-and-drag to specify an area to copy (right click = cancel)";
 			buttonTipShow = 120;
 		}
 		break;
@@ -1401,7 +1401,7 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
 		{
 			selectMode = SelectCut;
 			selectPoint1 = ui::Point(-1, -1);
-			buttonTip = "\x0F\xEF\xEF\x10\Click-and-drag to specify an area to copy then cut (right click = cancel)";
+			buttonTip = "\x0F\xEF\xEF\020Click-and-drag to specify an area to copy then cut (right click = cancel)";
 			buttonTipShow = 120;
 		}
 		break;