ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix scons build. 

OS X real wiimote support not yet tested post-merge.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6271 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-10-12 20:14:09 +00:00
parent 7e08fc19fc
commit a89b8f4a7d
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,6 @@ files = [
"OpenCL.cpp", "OpenCL.cpp",
"Plugin.cpp", "Plugin.cpp",
"PluginDSP.cpp", "PluginDSP.cpp",
"PluginWiimote.cpp",
"PluginVideo.cpp", "PluginVideo.cpp",
"SDCardUtil.cpp", "SDCardUtil.cpp",
"StringUtil.cpp", "StringUtil.cpp",

1
Source/Core/Core/Src/HW/DVDInterface.cpp
View File

@ -215,7 +215,6 @@ Common::CriticalSection dvdread_section;
static int ejectDisc; static int ejectDisc;
static int insertDisc; static int insertDisc;
static int executeDVD;
void EjectDiscCallback(u64 userdata, int cyclesLate); void EjectDiscCallback(u64 userdata, int cyclesLate);
void InsertDiscCallback(u64 userdata, int cyclesLate); void InsertDiscCallback(u64 userdata, int cyclesLate);

15
Source/Core/Core/Src/SConscript
View File

@ -136,6 +136,13 @@ files = [
"PowerPC/Jit64/Jit64_Tables.cpp", "PowerPC/Jit64/Jit64_Tables.cpp",
] ]
libs = [
'bdisasm',
'inputcommon',
'lua',
'sfml-network',
]
if sys.platform == 'win32': if sys.platform == 'win32':
files += [ "HW/BBA-TAP/TAP_Win32.cpp", "stdafx.cpp" ] files += [ "HW/BBA-TAP/TAP_Win32.cpp", "stdafx.cpp" ]
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
@ -145,13 +152,5 @@ else:
if env['HAVE_WIIUSE']: if env['HAVE_WIIUSE']:
files += [ 'HW/WiimoteReal/WiimoteReal.cpp' ] files += [ 'HW/WiimoteReal/WiimoteReal.cpp' ]
libs += [ 'wiiuse' ]
libs = [
'bdisasm',
'inputcommon',
'lua',
'sfml-network',
]
env.StaticLibrary(env['local_libs'] + 'core', files, LIBS = libs) env.StaticLibrary(env['local_libs'] + 'core', files, LIBS = libs)

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

@ -104,6 +104,9 @@ else:
env.InstallAs(env['data_dir'] + '/sys', '#Data/Sys') env.InstallAs(env['data_dir'] + '/sys', '#Data/Sys')
env.InstallAs(env['data_dir'] + '/user', '#Data/User') env.InstallAs(env['data_dir'] + '/user', '#Data/User')
if env['HAVE_WIIUSE']:
libs += [ 'wiiuse' ]
if env['HAVE_WX']: if env['HAVE_WX']:
env.StaticLibrary(env['local_libs'] + 'memcard', memcardfiles) env.StaticLibrary(env['local_libs'] + 'memcard', memcardfiles)
env.Program(exeGUI, files, LIBS = wxlibs + libs + env['LIBS']) env.Program(exeGUI, files, LIBS = wxlibs + libs + env['LIBS'])