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
parent
edabeffaaf
commit
a34ad40517
10
SConstruct
10
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/',
|
||||
]
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ files = [
|
|||
"PluginDSP.cpp",
|
||||
"PluginWiimote.cpp",
|
||||
"PluginVideo.cpp",
|
||||
"PluginPAD.cpp",
|
||||
"SDCardUtil.cpp",
|
||||
"StringUtil.cpp",
|
||||
"SymbolDB.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;
|
||||
|
|
|
|||
|
|
@ -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]);
|
||||
|
|
|
|||
|
|
@ -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']:
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include <vector>
|
||||
|
||||
#include <ControllerInterface/ControllerInterface.h>
|
||||
#include <Config.h>
|
||||
#include <ConfigInput.h>
|
||||
#include "FileSearch.h"
|
||||
|
||||
class PadSetting
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ files = [
|
|||
]
|
||||
|
||||
wiinewenv.Append(
|
||||
LIBS = [ 'inputplugincommon', 'inputcommon', 'common' ],
|
||||
LIBS = [ 'inputuicommon', 'inputcommon', 'common' ],
|
||||
)
|
||||
|
||||
if sys.platform == 'darwin':
|
||||
|
|
|
|||
Loading…
Reference in New Issue