mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-29 09:09:52 -06:00
On linux don't compile and link against lzo, soil, and sfml "Externals."
Instead use system libraries liblzo2-dev, libsoil-dev, and libsfml-dev git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5105 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
28
SConstruct
28
SConstruct
@ -50,10 +50,7 @@ include_paths = [
|
||||
basedir + 'Source/Core/Core/Src',
|
||||
basedir + 'Source/Core/DebuggerWX/Src',
|
||||
basedir + 'Externals/Bochs_disasm',
|
||||
basedir + 'Externals/LZO',
|
||||
basedir + 'Externals/SOIL',
|
||||
basedir + 'Externals/Lua',
|
||||
basedir + 'Externals/SFML/include',
|
||||
basedir + 'Externals/WiiUseSrc/Src',
|
||||
basedir + 'Source/Core/VideoCommon/Src',
|
||||
basedir + 'Source/Core/InputCommon/Src',
|
||||
@ -62,11 +59,15 @@ include_paths = [
|
||||
basedir + 'Source/Core/DSPCore/Src',
|
||||
]
|
||||
|
||||
if sys.platform == 'darwin':
|
||||
include_paths += [
|
||||
basedir + 'Externals/LZO', # TODO: Macs have port of lzo, use that instead
|
||||
basedir + 'Externals/SOIL',
|
||||
basedir + 'Externals/SFML/include',
|
||||
]
|
||||
|
||||
dirs = [
|
||||
'Externals/Bochs_disasm',
|
||||
'Externals/LZO',
|
||||
'Externals/SOIL',
|
||||
'Externals/SFML/src',
|
||||
'Externals/Lua',
|
||||
'Externals/WiiUseSrc/Src',
|
||||
'Source/Core/Common/Src',
|
||||
@ -88,6 +89,13 @@ dirs = [
|
||||
'Source/Core/DebuggerWX/Src',
|
||||
]
|
||||
|
||||
if sys.platform == 'darwin':
|
||||
dirs += [
|
||||
'Externals/LZO', # TODO: Macs have port of lzo, use that instead
|
||||
'Externals/SOIL',
|
||||
'Externals/SFML/src',
|
||||
]
|
||||
|
||||
builders = {}
|
||||
if sys.platform == 'darwin':
|
||||
from plistlib import writePlist
|
||||
@ -338,7 +346,13 @@ if sys.platform == 'darwin':
|
||||
else:
|
||||
env['HAVE_X11'] = conf.CheckPKG('x11')
|
||||
env['HAVE_COCOA'] = 0
|
||||
|
||||
# SOIL
|
||||
env['HAVE_SOIL'] = conf.CheckPKG('SOIL')
|
||||
# LZO
|
||||
env['HAVE_LZO'] = conf.CheckPKG('lzo2')
|
||||
# sfml
|
||||
env['HAVE_SFML'] = conf.CheckPKG('sfml-network') and conf.CheckCXXHeader("SFML/Network/Ftp.hpp")
|
||||
|
||||
# handling wx flags CCFLAGS should be created before
|
||||
wxmods = ['aui', 'adv', 'core', 'base']
|
||||
|
||||
|
Reference in New Issue
Block a user