mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
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:
30
Externals/MemcardManager/SConscript
vendored
30
Externals/MemcardManager/SConscript
vendored
@ -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)
|
||||
|
Reference in New Issue
Block a user