piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

An almost linux/osx compile fix beside some undefined references

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/Src/SConscript
View File

@ -28,7 +28,6 @@ files = [
"PluginDSP.cpp",
"PluginWiimote.cpp",
"PluginVideo.cpp",
"PluginPAD.cpp",
"SDCardUtil.cpp",
"StringUtil.cpp",
"SymbolDB.cpp",

2
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
View File

@ -37,7 +37,7 @@ bool CWII_IPC_HLE_Device_usb_kbd::Open(u32 _CommandAddress, u32 _Mode)
INFO_LOG(WII_IPC_STM, "CWII_IPC_HLE_Device_usb_kbd: Open");
IniFile ini;
ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
ini["USB Keyboard"].Get("Layout", &m_KeyboardLayout, KBD_LAYOUT_QWERTY);
ini["USB Keyboard"].Get("Layout", &m_KeyboardLayout, (int)KBD_LAYOUT_QWERTY);
for(int i = 0; i < 256; i++)
m_OldKeyBuffer[i] = false;

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

@ -439,7 +439,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
// Emulation status
int nState;
ini.Get("EmuState", "EmulationStateId", &nState);
ini["EmuState"].Get("EmulationStateId", &nState);
// Emulation state
SetItemColumnImage(_Index, COLUMN_EMULATION_STATE, m_EmuStateImageIndex[nState]);

2
Source/Core/DolphinWX/Src/SConscript
View File

@ -13,7 +13,7 @@ files = [
libs = [
'core', 'lzo2', 'discio', 'bdisasm', 'videocommon',
'inputcommon', 'common', 'lua', 'z', 'sfml-network'
'inputcommon', 'inputuicommon', 'common', 'lua', 'z', 'sfml-network'
]
if wxenv['HAVE_WX']:

2
Source/Core/InputCommon/Src/Config.cpp
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)

0
Source/Core/InputCommon/Src/Config.h → Source/Core/InputCommon/Src/ConfigInput.h
View File

9
Source/Core/InputCommon/Src/SConscript
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'

2
Source/Core/InputCommon/Src/X11InputBase.h
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