The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 16:19:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linux build fix

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5667 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-06-12 20:33:29 +00:00
parent 5fe57452af
commit 1936772725
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -47,7 +47,7 @@ include_paths = [
basedir + 'Externals/WiiUseSrc/Src', basedir + 'Externals/WiiUseSrc/Src',
basedir + 'Source/Core/VideoCommon/Src', basedir + 'Source/Core/VideoCommon/Src',
basedir + 'Source/Core/InputCommon/Src', basedir + 'Source/Core/InputCommon/Src',
basedir + 'Source/Plugins/InputUICommon/Src', basedir + 'Source/Core/InputUICommon/Src',
basedir + 'Source/Core/AudioCommon/Src', basedir + 'Source/Core/AudioCommon/Src',
basedir + 'Source/Core/DebuggerUICommon/Src', basedir + 'Source/Core/DebuggerUICommon/Src',
basedir + 'Source/Core/DSPCore/Src', basedir + 'Source/Core/DSPCore/Src',
@ -66,7 +66,7 @@ dirs = [
'Source/Core/DebuggerUICommon/Src', 'Source/Core/DebuggerUICommon/Src',
'Source/Core/DSPCore/Src', 'Source/Core/DSPCore/Src',
'Source/DSPTool/Src', 'Source/DSPTool/Src',
'Source/Plugins/InputUICommon/Src/', 'Source/Core/InputUICommon/Src/',
'Source/Plugins/Plugin_VideoOGL/Src', 'Source/Plugins/Plugin_VideoOGL/Src',
'Source/Plugins/Plugin_VideoSoftware/Src', 'Source/Plugins/Plugin_VideoSoftware/Src',
'Source/Plugins/Plugin_DSP_HLE/Src', 'Source/Plugins/Plugin_DSP_HLE/Src',

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

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

2
Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp
View File

@ -102,7 +102,7 @@ Keyboard::Key::Key(Display* const display, KeyCode keycode)
// Convert to upper case for the keyname // Convert to upper case for the keyname
if (keysym >= 97 && keysym <= 122) if (keysym >= 97 && keysym <= 122)
keysym = keysym - 32; keysym -= 32;
// 0x0110ffff is the top of the unicode character range according to keysymdef.h // 0x0110ffff is the top of the unicode character range according to keysymdef.h
// although it is probably more than we need. // although it is probably more than we need.

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

@ -12,4 +12,4 @@ files = [
'WXInputBase.cpp', 'WXInputBase.cpp',
] ]
env.StaticLibrary(env['local_libs'] + 'debugger_ui_util', files) env.StaticLibrary(env['local_libs'] + 'inputuicommon', files)

2
Source/Plugins/Plugin_GCPadNew/Src/SConscript
View File

@ -12,7 +12,7 @@ files = [
] ]
padenv.Append( padenv.Append(
LIBS = [ 'inputplugincommon', 'inputcommon', 'common' ], LIBS = [ 'inputuicommon', 'inputcommon', 'common' ],
) )
padenv.SharedLibrary(env['plugin_dir']+name, files) padenv.SharedLibrary(env['plugin_dir']+name, files)

2
Source/Plugins/Plugin_WiimoteNew/Src/SConscript
View File

@ -20,7 +20,7 @@ files = [
] ]
wiinewenv.Append( wiinewenv.Append(
LIBS = [ 'inputplugincommon', 'inputcommon', 'common' ], LIBS = [ 'inputuicommon', 'inputcommon', 'common' ],
) )
wiinewenv.SharedLibrary(env['plugin_dir']+name, files) wiinewenv.SharedLibrary(env['plugin_dir']+name, files)