From a34ad4051719830bdac91c0447f58ef0be4dca0d Mon Sep 17 00:00:00 2001 From: nakeee Date: Thu, 3 Jun 2010 05:59:58 +0000 Subject: [PATCH] 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 --- SConstruct | 10 ++------- Source/Core/Common/Src/SConscript | 1 - .../IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp | 2 +- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 2 +- Source/Core/DolphinWX/Src/SConscript | 2 +- Source/Core/InputCommon/Src/Config.cpp | 2 +- .../Src/{Config.h => ConfigInput.h} | 0 Source/Core/InputCommon/Src/SConscript | 9 ++------ Source/Core/InputCommon/Src/X11InputBase.h | 2 +- Source/Plugins/InputUICommon/Src/ConfigDiag.h | 2 +- Source/Plugins/InputUICommon/Src/SConscript | 22 +++++++------------ .../Plugins/Plugin_WiimoteNew/Src/SConscript | 2 +- 12 files changed, 19 insertions(+), 37 deletions(-) rename Source/Core/InputCommon/Src/{Config.h => ConfigInput.h} (100%) diff --git a/SConstruct b/SConstruct index a35f08324d..fd23a4f842 100644 --- a/SConstruct +++ b/SConstruct @@ -26,10 +26,6 @@ warnings = [ 'packed', 'no-conversion', ] -# XXX check for the availability of these (in GCC 4.3 or newer) -if sys.platform != 'darwin': - warnings.append('no-array-bounds') - warnings.append('no-unused-result') compileFlags = [ '-fno-exceptions', @@ -57,10 +53,10 @@ include_paths = [ basedir + 'Externals/WiiUseSrc/Src', basedir + 'Source/Core/VideoCommon/Src', basedir + 'Source/Core/InputCommon/Src', - basedir + 'Source/Plugins/InputPluginCommon/Src', basedir + 'Source/Core/AudioCommon/Src', basedir + 'Source/Core/DebuggerUICommon/Src', basedir + 'Source/Core/DSPCore/Src', + basedir + 'Source/Plugins/InputUICommon/Src', ] dirs = [ @@ -80,13 +76,11 @@ dirs = [ 'Source/Plugins/Plugin_VideoSoftware/Src', 'Source/Plugins/Plugin_DSP_HLE/Src', 'Source/Plugins/Plugin_DSP_LLE/Src', - 'Source/Plugins/Plugin_GCPad/Src', - 'Source/Plugins/Plugin_GCPadNew/Src', 'Source/Plugins/Plugin_Wiimote/Src', + 'Source/Plugins/InputUICommon/Src', 'Source/Core/DolphinWX/Src', 'Source/Core/DebuggerWX/Src', 'Source/UnitTests/', - 'Source/Plugins/InputPluginCommon/Src/', 'Source/Plugins/Plugin_WiimoteNew/Src/', ] diff --git a/Source/Core/Common/Src/SConscript b/Source/Core/Common/Src/SConscript index 8c3aba54c0..b5554f3936 100644 --- a/Source/Core/Common/Src/SConscript +++ b/Source/Core/Common/Src/SConscript @@ -28,7 +28,6 @@ files = [ "PluginDSP.cpp", "PluginWiimote.cpp", "PluginVideo.cpp", - "PluginPAD.cpp", "SDCardUtil.cpp", "StringUtil.cpp", "SymbolDB.cpp", diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp index 16e471eafd..918e062428 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp @@ -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; diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 576655c014..064c28c1bf 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -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]); diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index c352f14f64..663575114f 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -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']: diff --git a/Source/Core/InputCommon/Src/Config.cpp b/Source/Core/InputCommon/Src/Config.cpp index 134d2687e0..2b1b330e12 100644 --- a/Source/Core/InputCommon/Src/Config.cpp +++ b/Source/Core/InputCommon/Src/Config.cpp @@ -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) diff --git a/Source/Core/InputCommon/Src/Config.h b/Source/Core/InputCommon/Src/ConfigInput.h similarity index 100% rename from Source/Core/InputCommon/Src/Config.h rename to Source/Core/InputCommon/Src/ConfigInput.h diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript index d80a43f3c3..d116c0f49c 100644 --- a/Source/Core/InputCommon/Src/SConscript +++ b/Source/Core/InputCommon/Src/SConscript @@ -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' diff --git a/Source/Core/InputCommon/Src/X11InputBase.h b/Source/Core/InputCommon/Src/X11InputBase.h index 13c6717f86..0d9e85458d 100644 --- a/Source/Core/InputCommon/Src/X11InputBase.h +++ b/Source/Core/InputCommon/Src/X11InputBase.h @@ -20,7 +20,7 @@ #include #include -#include "Config.h" +#include "ConfigInput.h" #if defined(HAVE_WX) && HAVE_WX #include #endif diff --git a/Source/Plugins/InputUICommon/Src/ConfigDiag.h b/Source/Plugins/InputUICommon/Src/ConfigDiag.h index 1d22804ecd..e5a4b71a3e 100644 --- a/Source/Plugins/InputUICommon/Src/ConfigDiag.h +++ b/Source/Plugins/InputUICommon/Src/ConfigDiag.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include "FileSearch.h" class PadSetting diff --git a/Source/Plugins/InputUICommon/Src/SConscript b/Source/Plugins/InputUICommon/Src/SConscript index 69d010169f..d4d265eefd 100644 --- a/Source/Plugins/InputUICommon/Src/SConscript +++ b/Source/Plugins/InputUICommon/Src/SConscript @@ -1,19 +1,13 @@ # -*- python -*- Import('env') - -files = [ - 'Config.cpp', - 'ControllerEmu.cpp', - ] - if env['HAVE_WX']: - files += [ - 'ConfigDiagBitmaps.cpp', - 'ConfigDiag.cpp', - ] + + files = [ + 'ConfigDiagBitmaps.cpp', + 'ConfigDiag.cpp', + 'WXInputBase.cpp' + ] - - -env_inputpc = env.Clone() -env_inputpc.StaticLibrary(env['local_libs'] + "inputplugincommon", files) + env_inputpc = env.Clone() + env_inputpc.StaticLibrary(env['local_libs'] + "inputuicommon", files) diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript index 041c29ec5e..cb71e39a28 100644 --- a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript +++ b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript @@ -20,7 +20,7 @@ files = [ ] wiinewenv.Append( - LIBS = [ 'inputplugincommon', 'inputcommon', 'common' ], + LIBS = [ 'inputuicommon', 'inputcommon', 'common' ], ) if sys.platform == 'darwin':