Simplify the SCons build:

On OS X, build all code as Objective-C(++).

Centralize framework handling.

Cleanup.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5645 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-06-10 14:18:21 +00:00
parent de45e015cd
commit 404c625622
26 changed files with 110 additions and 253 deletions

View File

@ -20,36 +20,8 @@ if wxenv['HAVE_WX']:
'Source/Core/DolphinWX/Src/WxUtils.cpp',
]
if wxenv['HAVE_COCOA']:
files += [ 'cocoaApp.m', ]
compileFlags = [
'-x',
'objective-c++',
]
wxenv.Append(
CXXFLAGS = compileFlags,
LINKFLAGS = [
'-pthread',
],
LIBS = libs
)
if not wxenv['HAVE_WX']:
wxenv.Append(
LINKFLAGS = ['-framework', 'IOKit'])
else:
wxenv.Append(
LINKFLAGS = [
'-pthread',
],
LIBS = libs
)
LIBS = libs
exeGUI = env['binary_dir'] + 'MemcardManager'
#objects = [ wxenv.Object(srcFile) for srcFile in files ]
wxenv.Program(exeGUI, files)