From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue, 25 Nov 2008 09:28:30 +0000 (+0000)
Subject: Merge commit 'origin/gallium-0.1' into gallium-0.2
X-Git-Tag: android-x86-1.6~16^2~1465^2~496^2~246
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4af0d940a35536f096a9289470af0268a79402b3;p=android-x86%2Fexternal-mesa.git

Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	scons/gallium.py
	src/gallium/auxiliary/pipebuffer/pb_buffer.h
---

4af0d940a35536f096a9289470af0268a79402b3
diff --cc src/gallium/winsys/gdi/SConscript
index b463fa6505d,dce81ec1ca2..cc6aa6634fd
--- a/src/gallium/winsys/gdi/SConscript
+++ b/src/gallium/winsys/gdi/SConscript
@@@ -8,15 -8,21 +8,21 @@@ if env['platform'] == 'windows'
  	env = env.Clone()
  
  	env.Append(CPPPATH = [
 -		'#src/mesa/glapi',
 -		'#src/mesa',
 -		'#src/mesa/main',
 +		'#src/mesa/state_tracker/wgl',
 +	])
 +
 +	env.Append(CPPDEFINES = [
  	])
  
+ 	env.Append(CPPDEFINES = [
+ 		'__GL_EXPORTS',
+ 		'BUILD_GL32',
+ 		'_GNU_H_WINDOWS32_DEFINES',
+ 	])
+ 
  	sources = [
 -		'opengl32.def',
 -		'wgl.c',
 -		'wmesa.c',
 +		'#src/mesa/state_tracker/wgl/opengl32.def',
 +		'gdi_softpipe_winsys.c',
  	]
  		
  	drivers = [