An almost linux/osx compile fix beside some undefined references

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5581 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2010-06-03 05:59:58 +00:00
parent edabeffaaf
commit a34ad40517
12 changed files with 19 additions and 37 deletions

View File

@ -1,5 +1,5 @@
#include "Config.h"
#include "ConfigInput.h"
Plugin::Plugin( const char* const _ini_name, const char* const _gui_name, const char* const _profile_name )
: ini_name(_ini_name)

View File

@ -5,8 +5,8 @@ icenv = env.Clone()
files = [
'Configuration.cpp',
'EventHandler.cpp',
'InputCommon.cpp',
'Config.cpp',
'ControllerEmu.cpp',
'SDL_Util.cpp',
'ControllerInterface/ControllerInterface.cpp',
]
@ -16,11 +16,6 @@ if env['HAVE_X11']:
"X11InputBase.cpp",
]
if env['HAVE_WX']:
files += [
"WXInputBase.cpp",
]
if icenv['HAVE_SDL']:
files += [
'ControllerInterface/SDL/SDL.cpp'

View File

@ -20,7 +20,7 @@
#include <X11/X.h>
#include <X11/keysym.h>
#include "Config.h"
#include "ConfigInput.h"
#if defined(HAVE_WX) && HAVE_WX
#include <wx/wx.h>
#endif