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

Made layout more consistent.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@628 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne
2008-09-23 00:24:28 +00:00
parent 26b6e7df49
commit 6e424f152a
1 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
SConstruct
View File

@ -30,14 +30,14 @@ compileFlags = [
'-fno-strict-aliasing', '-fno-strict-aliasing',
'-msse2', '-msse2',
'-fvisibility=hidden', '-fvisibility=hidden',
# '-fomit-frame-pointer' #'-fomit-frame-pointer'
] ]
cppDefines = [ cppDefines = [
( '_FILE_OFFSET_BITS', 64), ( '_FILE_OFFSET_BITS', 64),
'_LARGEFILE_SOURCE', '_LARGEFILE_SOURCE',
'GCC_HASCLASSVISIBILITY', 'GCC_HASCLASSVISIBILITY',
] ]
if sys.platform == 'darwin': if sys.platform == 'darwin':
@ -93,10 +93,10 @@ vars.AddVariables(
BoolVariable('lint', 'Set for lint build (extra warnings)', False), BoolVariable('lint', 'Set for lint build (extra warnings)', False),
BoolVariable('nowx', 'Set For Building with no WX libs (WIP)', False), BoolVariable('nowx', 'Set For Building with no WX libs (WIP)', False),
EnumVariable('flavor', 'Choose a build flavor', 'release', EnumVariable('flavor', 'Choose a build flavor', 'release',
allowed_values=('release', 'devel', 'debug'), allowed_values = ('release', 'devel', 'debug'),
ignorecase=2) ignorecase = 2
)
) )
env = Environment( env = Environment(
CC = 'gcc', CC = 'gcc',
@ -162,11 +162,13 @@ conf = env.Configure(custom_tests = tests)
# handling wx flags CCFLAGS should be created before # handling wx flags CCFLAGS should be created before
if not env['nowx']: if not env['nowx']:
env['wxconfig']='wx-config' env['wxconfig'] = 'wx-config'
env['build_platform']=env['PLATFORM'] env['build_platform'] = env['PLATFORM']
env['target_platform']=env['PLATFORM'] env['target_platform'] = env['PLATFORM']
if not conf.CheckWXConfig('2.8', ['gl', 'adv', 'core', 'base'], env['debug']): if not conf.CheckWXConfig(
'2.8', ['gl', 'adv', 'core', 'base'], env['debug']
):
print 'gui build requires wxwidgets >= 2.8' print 'gui build requires wxwidgets >= 2.8'
Exit(1) Exit(1)
@ -187,7 +189,7 @@ env.AddMethod(utils.filterWarnings)
Export('env') Export('env')
# print a nice progress indication when not compiling # print a nice progress indication when not compiling
Progress(['-\r', '\\\r', '|\r', '/\r'], interval=5) Progress(['-\r', '\\\r', '|\r', '/\r'], interval = 5)
# die on unknown variables # die on unknown variables
unknown = vars.UnknownVariables() unknown = vars.UnknownVariables()