From 975e58499a07775e071c2517b4fa21306e8349bb Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Tue, 30 Dec 2008 17:13:38 +0000 Subject: 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. --- src/mesa/SConscript | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/mesa/SConscript') 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', -- cgit v1.2.3 From 2105b61846aad8d0c12dec00ef0c9ebdaacd0d4a Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Tue, 6 Jan 2009 16:20:12 +0000 Subject: mesa: Ensure gl* symbols are marked as dllexport on windows. --- src/mesa/SConscript | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/mesa/SConscript') diff --git a/src/mesa/SConscript b/src/mesa/SConscript index dd0468fb93..01620ee614 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -12,6 +12,12 @@ if env['platform'] != 'winddk': '#/src/mesa', ]) + if env['platform'] == 'windows': + env.Append(CPPDEFINES = [ + '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers + 'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers + ]) + # # Source files # -- cgit v1.2.3