ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix gcc build. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7393 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-03-22 09:40:47 +00:00
parent f8620fcd0b
commit 27f9faf7e6
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SConstruct
View File

@ -183,24 +183,8 @@ else:
print "gtk+-2.0 developement headers not detected" print "gtk+-2.0 developement headers not detected"
print "gtk+-2.0 is required to build the WX GUI" print "gtk+-2.0 is required to build the WX GUI"
Exit(1) Exit(1)
env.ParseConfig('pkg-config --cflags --libs gtk+-2.0')
env['CPPDEFINES'] += ['__WXGTK__'] env['CPPDEFINES'] += ['__WXGTK__']
env['CPPPATH'] += ['/usr/include/atk-1.0']
env['CPPPATH'] += ['/usr/include/cairo']
env['CPPPATH'] += ['/usr/include/glib-2.0']
env['CPPPATH'] += ['/usr/include/gtk-2.0']
env['CPPPATH'] += ['/usr/include/pango-1.0']
env['CPPPATH'] += ['/usr/pkg/include/atk-1.0']
env['CPPPATH'] += ['/usr/pkg/include/cairo']
env['CPPPATH'] += ['/usr/pkg/include/glib-2.0']
env['CPPPATH'] += ['/usr/pkg/include/gtk-2.0']
env['CPPPATH'] += ['/usr/pkg/include/pango-1.0']
env['CPPPATH'] += ['/usr/local/include/atk-1.0']
env['CPPPATH'] += ['/usr/local/include/cairo']
env['CPPPATH'] += ['/usr/local/include/glib-2.0']
env['CPPPATH'] += ['/usr/local/include/gtk-2.0']
env['CPPPATH'] += ['/usr/local/include/pango-1.0']
env['CPPPATH'] += ['/usr/lib/glib-2.0/include']
env['CPPPATH'] += ['/usr/lib/gtk-2.0/include']
conf.Define('HAVE_WX', 1) conf.Define('HAVE_WX', 1)
env['HAVE_BLUEZ'] = conf.CheckLib('bluetooth') env['HAVE_BLUEZ'] = conf.CheckLib('bluetooth')

1
Source/Core/DolphinWX/Src/GameListCtrl.cpp
View File

@ -21,6 +21,7 @@
#include <wx/fontmap.h> #include <wx/fontmap.h>
#include <algorithm> #include <algorithm>
#include <memory>
#include "FileSearch.h" #include "FileSearch.h"
#include "StringUtil.h" #include "StringUtil.h"

2
Source/Core/VideoCommon/Src/VideoConfig.cpp
View File

@ -118,7 +118,7 @@ void VideoConfig::Load(const char *main_ini_file, bool filecheck_passed, const c
iniFile.Get("Hardware", "Adapter", &iAdapter, 0); iniFile.Get("Hardware", "Adapter", &iAdapter, 0);
if (iAdapter == -1) if (iAdapter == -1)
iAdapter = 0; iAdapter = 0;
SET_STATE(true, iAdapter); SET_STATE((void)true, iAdapter);
// Load common settings // Load common settings
iniFile.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)); iniFile.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));