summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhrydgard <hrydgard@gmail.com>2008-07-31 20:25:30 +0000
committerhrydgard <hrydgard@gmail.com>2008-07-31 20:25:30 +0000
commit523ca5a6823f7dbc596af57d53ac8dcd479bc69c (patch)
treed67b6b8aba63f083f745a0ab0ac8a78a259105a6
parentd8fa3113ea34508dca2fc0acb0ae37d870235c3d (diff)
gah, fixed accidentally reverted SConstruct
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@115 8ced0084-cf51-0410-be5f-012b33b47a6e
-rw-r--r--SConstruct24
1 files changed, 14 insertions, 10 deletions
diff --git a/SConstruct b/SConstruct
index 3d5d5e9194..54c8cd7721 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,7 +1,11 @@
import os
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':
ccflags += ' -I/opt/local/include'
@@ -25,15 +29,15 @@ if sys.platform == 'darwin':
"Externals/Bochs_disasm",
"Source/Core/Core/Src",
"Source/Core/DiscIO/Src",
- "Source/Core/DebuggerWX/src",
- "Source/Core/VideoCommon/Src",
-# "Source/Plugins/Plugin_VideoOGL/Src",
- "Source/Plugins/Plugin_DSP_NULL/Src",
-# "Source/Plugins/Plugin_DSP_LLE/Src",
- "Source/Plugins/Plugin_PadSimple/Src",
- "Source/Plugins/Plugin_nJoy_SDL/Src",
- "Source/Core/DolphinWX/src",
- ]
+ "Source/Core/DebuggerWX/src",
+ "Source/Core/VideoCommon/Src",
+# "Source/Plugins/Plugin_VideoOGL/Src",
+ "Source/Plugins/Plugin_DSP_NULL/Src",
+# "Source/Plugins/Plugin_DSP_LLE/Src",
+ "Source/Plugins/Plugin_PadSimple/Src",
+ "Source/Plugins/Plugin_nJoy_SDL/Src",
+ "Source/Core/DolphinWX/src",
+ ]
else:
dirs = ["Source/Core/Common/Src",
"Externals/Bochs_disasm",