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

Clean up OS X wx library handling a bit.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6403 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-11-14 06:02:44 +00:00
parent d888f13bb9
commit 8b9b66911f
4 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/AudioCommon/CMakeLists.txt
View File

@ -31,6 +31,7 @@ else()
if(WIN32)
set(SRCS ${SRCS} Src/DSoundStream.cpp)
set(SRCS ${SRCS} Src/XAudio2Stream.cpp)
endif(WIN32)
endif()

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

@ -24,7 +24,6 @@ else:
files += [ 'PulseAudioStream.cpp' ]
if sys.platform == 'win32':
files += [ 'DSoundStream.cpp' ]
if sys.platform == 'win32':
files += [ 'XAudio2Stream.cpp' ]
env.StaticLibrary(env['local_libs'] + 'audiocommon', files)

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

@ -58,10 +58,8 @@ elif sys.platform == 'darwin' and not env['HAVE_WX']:
files += [ 'cocoaApp.m' ]
exeNoGUI = '#' + env['prefix'] + '/DolphinNoGUI'
elif sys.platform == 'darwin' and env['HAVE_WX']:
exeGUI = 'Dolphin'
exeGUIdist = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin'
wxlibs += env['wxconfiglibs']
exeGUI = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin'
env.Install('#' + env['prefix'] + '/Dolphin.app/Contents/' +
'Library/Frameworks/Cg.framework',
@ -89,14 +87,6 @@ elif sys.platform == 'darwin' and env['HAVE_WX']:
LSMinimumSystemVersion = '10.5.0',
LSRequiresCarbon = True,
)))
def Fixup(target, source, env):
if env['CPPDEFINES'].count('WXUSINGDLL'):
pass
os.link(str(source[0]), str(target[0]))
env.Append(BUILDERS = {'Fixup' : Builder(action = Fixup)})
env.Depends(exeGUIdist, env['plugin_dir'])
env.Fixup(exeGUIdist, exeGUI)
else:
files += [ 'X11Utils.cpp' ]
libs += [ 'SDL' ]