mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-27 01:44:31 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #136 from mniip/scons

Browse Source 
mingw compiling fixes
This commit is contained in:
jacob1
2013-05-20 08:30:08 -07:00
parent 35f84a0942 3979395e65
commit bd262d8c92
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SConscript
View File

@@ -74,7 +74,13 @@ if GetOption("toolprefix"):
#Check for headers and libraries #Check for headers and libraries
if not GetOption("macosx"): if not GetOption("macosx"):
conf = Configure(env) conf = Configure(env)
if(GetOption("sdl-dir")):
if not conf.CheckCHeader(GetOption("sdl-dir") + '/SDL.h'):
print "sdl headers not found or not installed"
raise SystemExit(1)
else:
env.Append(CPPPATH=[GetOption("sdl-dir")])
else:
try: try:
env.ParseConfig('sdl-config --cflags') env.ParseConfig('sdl-config --cflags')
env.ParseConfig('sdl-config --libs') env.ParseConfig('sdl-config --libs')
@@ -83,12 +89,6 @@ if not GetOption("macosx"):
print "libSDL not found or not installed" print "libSDL not found or not installed"
raise SystemExit(1) raise SystemExit(1)
if(GetOption("sdl-dir")):
if not conf.CheckCHeader(GetOption("sdl-dir") + '/SDL.h'):
print "sdl headers not found or not installed"
raise SystemExit(1)
else:
env.Append(CPPPATH=[GetOption("sdl-dir")])
#Find correct lua include dir #Find correct lua include dir
if not GetOption("nolua"): if not GetOption("nolua"):

3
src/PowderToySDL.cpp
View File

@@ -16,8 +16,8 @@
#include "graphics/Graphics.h" #include "graphics/Graphics.h"
#if defined(LIN) #if defined(LIN)
#include "icon.h" #include "icon.h"
#include <signal.h>
#endif #endif
#include <signal.h>
#ifndef WIN #ifndef WIN
#include <unistd.h> #include <unistd.h>
@@ -786,7 +786,6 @@ int main(int argc, char * argv[])
signal(SIGFPE, SigHandler); signal(SIGFPE, SigHandler);
signal(SIGILL, SigHandler); signal(SIGILL, SigHandler);
signal(SIGABRT, SigHandler); signal(SIGABRT, SigHandler);
#endif #endif
GameController * gameController = NULL; GameController * gameController = NULL;

6
src/gui/game/GameView.cpp
View File

@@ -1212,7 +1212,7 @@ void GameView::BeginStampSelection()
{ {
selectMode = SelectStamp; selectMode = SelectStamp;
selectPoint1 = ui::Point(-1, -1); 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; buttonTipShow = 120;
} }
@@ -1392,7 +1392,7 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
{ {
selectMode = SelectCopy; selectMode = SelectCopy;
selectPoint1 = ui::Point(-1, -1); 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; buttonTipShow = 120;
} }
break; break;
@@ -1401,7 +1401,7 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
{ {
selectMode = SelectCut; selectMode = SelectCut;
selectPoint1 = ui::Point(-1, -1); 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; buttonTipShow = 120;
} }
break; break;