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

Guard against controller instances without any inputs.

Browse Source 
Clean up OS X keyboard key names.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6985 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-01-30 08:12:34 +00:00
parent aa410c8eea
commit f41e5b3b85
6 changed files with 121 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,6 @@ else:
if sys.platform == 'win32':
files += [ "stdafx.cpp" ]
elif sys.platform == 'darwin':
libs += [ 'iconv' ]
ldflags += [ '-Wl,-force_load,' + env['libvideo'][0].path ]
ldflags += [ '-Xarch_i386', '-Wl,-framework,QuickTime' ]
ldflags += [ '-weak_framework', 'OpenCL' ]
@ -70,6 +69,7 @@ elif sys.platform == 'darwin':
if env['HAVE_WX']:
wxlibs += env['wxconfiglibs']
else:
libs += [ 'iconv' ]
exe += 'NoGUI'