summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2008-12-30 17:13:38 +0000
committerJosé Fonseca <jfonseca@vmware.com>2008-12-30 17:13:38 +0000
commit975e58499a07775e071c2517b4fa21306e8349bb (patch)
tree2a6de93377dbf582a5b9c835fdfcf5626c75b300
parent42d00790029da4bc7e77f68c8f1c22ac9c417e42 (diff)
scons: Specify C99 throughout all the tree.
MSVC may not support full C99, but supports more than plain C90. And -pedantic without -std=c99 generates too many spurious warnings (specially C++ style comments) to be of any use. Note that using certain C99 features in the cross-platform parts of Gallium is still not possible; namely mid-of-scope variable declarations and named structure initializers will break MSVC builds.
-rw-r--r--scons/gallium.py1
-rw-r--r--src/mesa/SConscript6
2 files changed, 2 insertions, 5 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index 6dbce62b8e..92cafa27e0 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -313,6 +313,7 @@ def generate(env):
'-Wmissing-prototypes',
'-Wno-long-long',
'-ffast-math',
+ '-std=c99',
'-pedantic',
'-fmessage-length=0', # be nice to Eclipse
]
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index abd64030b6..dd0468fb93 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -12,11 +12,6 @@ if env['platform'] != 'winddk':
'#/src/mesa',
])
- if gcc:
- env.Append(CFLAGS = [
- '-std=c99',
- ])
-
#
# Source files
#
@@ -165,6 +160,7 @@ if env['platform'] != 'winddk':
'state_tracker/st_context.c',
'state_tracker/st_debug.c',
'state_tracker/st_draw.c',
+ 'state_tracker/st_draw_feedback.c',
'state_tracker/st_extensions.c',
'state_tracker/st_format.c',
'state_tracker/st_framebuffer.c',