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

Temporarily re-enable SDL pad input on OS X.

Browse Source 
Placeholder SConscript for VideoMerge plugin.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6272 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-10-12 22:26:30 +00:00
parent a89b8f4a7d
commit e81a10fb44
5 changed files with 71 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SConstruct
View File

@ -133,7 +133,7 @@ if sys.platform == 'darwin':
env['FRAMEWORKS'] += ['AudioUnit', 'CoreAudio']
env['FRAMEWORKS'] += ['IOBluetooth', 'IOKit', 'OpenGL']
env['LIBPATH'] += ['/Developer/SDKs/MacOSX10.5.sdk/usr/lib']
env['LIBS'] = ['gcc_s.10.5', 'iconv']
env['LIBS'] = ['gcc_s.10.5', 'iconv', 'SDL']
env['LINKFLAGS'] += ccld
env['LINKFLAGS'] += ['-Wl,-search_paths_first', '-Wl,-Z']
env['LINKFLAGS'] += [
@ -371,6 +371,7 @@ dirs = [
'Source/Plugins/Plugin_DSP_LLE/Src',
#'Source/Plugins/Plugin_VideoDX11/Src',
#'Source/Plugins/Plugin_VideoDX9/Src',
#'Source/Plugins/Plugin_VideoMerge/Src',
'Source/Plugins/Plugin_VideoOGL/Src',
'Source/Plugins/Plugin_VideoSoftware/Src',
'Source/UnitTests',