mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-15 05:47:56 -07:00
Made layout (indent and quotes) more consistent.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@580 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
dae082e59e
commit
78bb1cf82d
44
SConstruct
44
SConstruct
@ -38,25 +38,25 @@ include_paths = [
|
|||||||
'../../../Core/Core/Src',
|
'../../../Core/Core/Src',
|
||||||
'../../../Core/DebuggerWX/src',
|
'../../../Core/DebuggerWX/src',
|
||||||
'../../../../Externals/Bochs_disasm',
|
'../../../../Externals/Bochs_disasm',
|
||||||
'../../../../Externals/LZO',
|
'../../../../Externals/LZO',
|
||||||
'../../../Core/VideoCommon/Src',
|
'../../../Core/VideoCommon/Src',
|
||||||
]
|
]
|
||||||
|
|
||||||
dirs = [
|
dirs = [
|
||||||
"Source/Core/Common/Src",
|
'Source/Core/Common/Src',
|
||||||
"Externals/Bochs_disasm",
|
'Externals/Bochs_disasm',
|
||||||
"Externals/LZO",
|
'Externals/LZO',
|
||||||
"Source/Core/Core/Src",
|
'Source/Core/Core/Src',
|
||||||
"Source/Core/DiscIO/Src",
|
'Source/Core/DiscIO/Src',
|
||||||
"Source/Core/DebuggerWX/src",
|
'Source/Core/DebuggerWX/src',
|
||||||
"Source/Core/VideoCommon/Src",
|
'Source/Core/VideoCommon/Src',
|
||||||
"Source/Plugins/Plugin_VideoOGL/Src",
|
'Source/Plugins/Plugin_VideoOGL/Src',
|
||||||
"Source/Plugins/Plugin_DSP_HLE/Src",
|
'Source/Plugins/Plugin_DSP_HLE/Src',
|
||||||
"Source/Plugins/Plugin_DSP_LLE/Src",
|
'Source/Plugins/Plugin_DSP_LLE/Src',
|
||||||
"Source/Plugins/Plugin_PadSimple/Src",
|
'Source/Plugins/Plugin_PadSimple/Src',
|
||||||
"Source/Plugins/Plugin_nJoy_SDL/Src",
|
'Source/Plugins/Plugin_nJoy_SDL/Src',
|
||||||
"Source/Plugins/Plugin_Wiimote_Test/Src",
|
'Source/Plugins/Plugin_Wiimote_Test/Src',
|
||||||
"Source/Core/DolphinWX/Src",
|
'Source/Core/DolphinWX/Src',
|
||||||
]
|
]
|
||||||
|
|
||||||
builders = {}
|
builders = {}
|
||||||
@ -74,20 +74,20 @@ lib_paths = include_paths
|
|||||||
|
|
||||||
debug = ARGUMENTS.get('debug', 0)
|
debug = ARGUMENTS.get('debug', 0)
|
||||||
if int(debug):
|
if int(debug):
|
||||||
compileFlags.append('-g')
|
compileFlags.append('-g')
|
||||||
compileFlags.append('-DLOGGING')
|
compileFlags.append('-DLOGGING')
|
||||||
else:
|
else:
|
||||||
compileFlags.append('-O3')
|
compileFlags.append('-O3')
|
||||||
|
|
||||||
lint = ARGUMENTS.get('lint', 0)
|
lint = ARGUMENTS.get('lint', 0)
|
||||||
if int(lint):
|
if int(lint):
|
||||||
warnings.append('error')
|
warnings.append('error')
|
||||||
|
|
||||||
compileFlags += [ '-W' + warning for warning in warnings ]
|
compileFlags += [ '-W' + warning for warning in warnings ]
|
||||||
|
|
||||||
env = Environment(
|
env = Environment(
|
||||||
CC = "gcc",
|
CC = 'gcc',
|
||||||
CXX = "g++",
|
CXX = 'g++',
|
||||||
CCFLAGS = ' '.join(compileFlags),
|
CCFLAGS = ' '.join(compileFlags),
|
||||||
CXXFLAGS = ' '.join(compileFlags + [ '-fvisibility-inlines-hidden' ]),
|
CXXFLAGS = ' '.join(compileFlags + [ '-fvisibility-inlines-hidden' ]),
|
||||||
CPPPATH = include_paths,
|
CPPPATH = include_paths,
|
||||||
|
Loading…
Reference in New Issue
Block a user