gah, fixed accidentally reverted SConstruct
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@115 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
d8fa3113ea
commit
523ca5a682
24
SConstruct
24
SConstruct
|
@ -1,7 +1,11 @@
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
ccflags = '-g -O3 -fno-strict-aliasing -fPIC -msse2 -Wall -DLOGGING -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE'
|
warnings = ' -Wall -Wwrite-strings -Wfloat-equal -Wshadow -Wpointer-arith -Wcast-qual -Wpacked'
|
||||||
|
|
||||||
|
nonactive_warnings = '-Wunreachable-code'
|
||||||
|
|
||||||
|
ccflags = '-g -O3 -fno-strict-aliasing -fPIC -msse2 -DLOGGING -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE' + warnings
|
||||||
|
|
||||||
if sys.platform == 'darwin':
|
if sys.platform == 'darwin':
|
||||||
ccflags += ' -I/opt/local/include'
|
ccflags += ' -I/opt/local/include'
|
||||||
|
@ -25,15 +29,15 @@ if sys.platform == 'darwin':
|
||||||
"Externals/Bochs_disasm",
|
"Externals/Bochs_disasm",
|
||||||
"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_NULL/Src",
|
"Source/Plugins/Plugin_DSP_NULL/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/Core/DolphinWX/src",
|
"Source/Core/DolphinWX/src",
|
||||||
]
|
]
|
||||||
else:
|
else:
|
||||||
dirs = ["Source/Core/Common/Src",
|
dirs = ["Source/Core/Common/Src",
|
||||||
"Externals/Bochs_disasm",
|
"Externals/Bochs_disasm",
|
||||||
|
|
Loading…
Reference in New Issue