mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 14:49:42 -06:00
Made layout more consistent.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@628 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
24
SConstruct
24
SConstruct
@ -30,14 +30,14 @@ compileFlags = [
|
||||
'-fno-strict-aliasing',
|
||||
'-msse2',
|
||||
'-fvisibility=hidden',
|
||||
# '-fomit-frame-pointer'
|
||||
#'-fomit-frame-pointer'
|
||||
]
|
||||
|
||||
cppDefines = [
|
||||
( '_FILE_OFFSET_BITS', 64),
|
||||
'_LARGEFILE_SOURCE',
|
||||
'GCC_HASCLASSVISIBILITY',
|
||||
]
|
||||
]
|
||||
|
||||
|
||||
if sys.platform == 'darwin':
|
||||
@ -93,10 +93,10 @@ vars.AddVariables(
|
||||
BoolVariable('lint', 'Set for lint build (extra warnings)', False),
|
||||
BoolVariable('nowx', 'Set For Building with no WX libs (WIP)', False),
|
||||
EnumVariable('flavor', 'Choose a build flavor', 'release',
|
||||
allowed_values=('release', 'devel', 'debug'),
|
||||
ignorecase=2)
|
||||
|
||||
)
|
||||
allowed_values = ('release', 'devel', 'debug'),
|
||||
ignorecase = 2
|
||||
)
|
||||
)
|
||||
|
||||
env = Environment(
|
||||
CC = 'gcc',
|
||||
@ -162,11 +162,13 @@ conf = env.Configure(custom_tests = tests)
|
||||
|
||||
# handling wx flags CCFLAGS should be created before
|
||||
if not env['nowx']:
|
||||
env['wxconfig']='wx-config'
|
||||
env['build_platform']=env['PLATFORM']
|
||||
env['target_platform']=env['PLATFORM']
|
||||
env['wxconfig'] = 'wx-config'
|
||||
env['build_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'
|
||||
Exit(1)
|
||||
|
||||
@ -187,7 +189,7 @@ env.AddMethod(utils.filterWarnings)
|
||||
Export('env')
|
||||
|
||||
# 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
|
||||
unknown = vars.UnknownVariables()
|
||||
|
Reference in New Issue
Block a user