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

Don't bother using autoconfiguration to find the OpenCL and Cg

Browse Source 
frameworks on OS X.

Try to be a little clearer about which configuration options apply    
to which platform(s). Should pave the way slightly for win32 scons. 
 
We have accidentally been using LUA_USE_LINUX on OS X all along.
Turns out that LUA_USE_MACOSX is for an ancient version of OS X and
LUA_USE_LINUX is a reasonable set of defaults for modern Unices, so
just keep using that.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5804 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-06-26 19:17:43 +00:00
parent 9de9ec1fb6
commit d18085c3ad
7 changed files with 102 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/AudioCommon/Src/SConscript
View File

@ -10,19 +10,18 @@ files = [
'AudioCommon.cpp',
]
if env['HAVE_OPENAL']:
files += [ 'OpenALStream.cpp', 'aldlist.cpp' ]
if env['HAVE_AO']:
files += [ 'AOSoundStream.cpp' ]
if env['HAVE_ALSA']:
files += [ 'AlsaSoundStream.cpp' ]
if env['HAVE_PULSEAUDIO']:
files += [ 'PulseAudioStream.cpp' ]
if sys.platform == 'darwin':
files += [ 'CoreAudioSoundStream.cpp' ]
else:
if env['HAVE_OPENAL']:
files += [ 'OpenALStream.cpp', 'aldlist.cpp' ]
if not sys.platform == 'win32' and not sys.platform == 'darwin':
if env['HAVE_AO']:
files += [ 'AOSoundStream.cpp' ]
if env['HAVE_ALSA']:
files += [ 'AlsaSoundStream.cpp' ]
if env['HAVE_PULSEAUDIO']:
files += [ 'PulseAudioStream.cpp' ]
env.StaticLibrary(env['local_libs'] + 'audiocommon', files)

13
Source/Core/Core/Src/SConscript
View File

@ -126,14 +126,11 @@ if not env['NOJIT']:
]
if sys.platform == 'win32':
files += [ "stdafx.cpp",
"HW/BBA-TAP/TAP_Win32.cpp"
]
else:
if sys.platform == 'darwin':
files += [ "HW/BBA-TAP/TAP_Apple.cpp"]
else:
files += [ "HW/BBA-TAP/TAP_Unix.cpp"]
files += [ "HW/BBA-TAP/TAP_Win32.cpp", "stdafx.cpp" ]
elif sys.platform == 'darwin':
files += [ "HW/BBA-TAP/TAP_Apple.cpp"]
else:
files += [ "HW/BBA-TAP/TAP_Unix.cpp"]
libs = [
'bdisasm',

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

@ -59,8 +59,7 @@ else:
if sys.platform == 'win32':
files += [ "stdafx.cpp" ]
if sys.platform == 'darwin':
elif sys.platform == 'darwin':
files += [ 'cocoaApp.m' ]
exeGUI = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin'
@ -85,6 +84,7 @@ if sys.platform == 'darwin':
))
)
else:
files += [ 'X11Utils.cpp' ]
exeGUI = env['binary_dir'] + 'dolphin-emu'
exeNoGUI = env['binary_dir'] + 'dolphin-emu-nogui'
@ -92,9 +92,6 @@ wxenv.Append(
LIBS = libs
)
if wxenv['HAVE_X11']:
files += [ 'X11Utils.cpp' ]
if wxenv['HAVE_WX']:
wxenv.Program(exeGUI, files + [ 'Main.cpp' ])
wxenv.StaticLibrary(env['local_libs'] + 'memcard', memcardfiles)

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

@ -11,21 +11,20 @@ files = [
'ControllerInterface/SDL/SDL.cpp'
]
if env['HAVE_X11']:
files += [
"X11InputBase.cpp",
]
if sys.platform == 'darwin':
if sys.platform == 'win32':
files += [
]
elif sys.platform == 'darwin':
files += [
'ControllerInterface/OSX/OSX.mm',
'ControllerInterface/OSX/OSXKeyboard.mm',
'ControllerInterface/OSX/OSXMouse.mm'
]
if sys.platform == 'linux2':
else:
files += [
'ControllerInterface/Xlib/Xlib.cpp'
'ControllerInterface/Xlib/Xlib.cpp',
'X11InputBase.cpp'
]
env.StaticLibrary(env['local_libs'] + "inputcommon", files)