piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-12 22:42:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert commit 5105 until we sort out how we want this to work in linux.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5110 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-02-22 16:10:08 +00:00
parent ffdf087aad
commit 303769d31c
9 changed files with 15 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
SConstruct
View File

@ -50,7 +50,10 @@ 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',
@ -59,15 +62,11 @@ 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',
@ -89,13 +88,6 @@ 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
@ -346,13 +338,7 @@ 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']