summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2008-12-30 17:13:38 +0000
committerJosé Fonseca <jfonseca@vmware.com>2009-01-05 15:24:56 +0000
commit8ee1df065234eaf27c53c03bdf6e4ad487bc326d (patch)
tree8b03f43a12ecc9bbc9ba884a09f7a1b15e135407
parent49c40b10c72e64977971ccb96abfc8767ed4c6ea (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 1136d26908..19eeb18be8 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -311,6 +311,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 a690d576b1..72ddc341d1 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
#
@@ -164,6 +159,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',