From c42e6254cffb8ef480868e9c1942f73129fc4f80 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Thu, 31 Jan 2008 13:14:35 +0900
Subject: gallium: Add SCons as alternative build system for Gallium.

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 033e6e10bd..bf50291fc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ depend
 depend.bak
 lib
 lib64
+.sconsign*
+config.py
-- 
cgit v1.2.3


From 0013796948642b281ec84628d6f945b686cd6849 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Thu, 7 Feb 2008 19:59:17 +0900
Subject: gallium: Conditionally use posix libraries/includes.

---
 .gitignore |  1 +
 SConstruct | 43 ++++++++++++++++++++++---------------------
 2 files changed, 23 insertions(+), 21 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index bf50291fc1..b5e59dfc3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ lib
 lib64
 .sconsign*
 config.py
+build
diff --git a/SConstruct b/SConstruct
index 47f9b5389b..22a4072c93 100644
--- a/SConstruct
+++ b/SConstruct
@@ -95,19 +95,8 @@ if gcc:
 	env.Append(CFLAGS = '-fmessage-length=0')
 	env.Append(CXXFLAGS = '-fmessage-length=0')
 
-# Defines
-env.Append(CPPDEFINES = [
-	'_POSIX_SOURCE',
-	('_POSIX_C_SOURCE', '199309L'), 
-	'_SVID_SOURCE',
-	'_BSD_SOURCE', 
-	'_GNU_SOURCE',
-	
-	'PTHREADS',
-	'HAVE_ALIAS', 
-	'HAVE_POSIX_MEMALIGN',
-])
 
+# Defines
 if debug:
 	env.Append(CPPDEFINES = ['DEBUG'])
 else:
@@ -120,8 +109,6 @@ env.Append(CPPPATH = [
 	'#/src/mesa',
 	'#/src/mesa/main',
 	'#/src/mesa/pipe',
-	
-	'/usr/X11R6/include',
 ])
 
 
@@ -137,14 +124,28 @@ if x86:
 		env.Append(CFLAGS = '-m32')
 		env.Append(CXXFLAGS = '-m32')
 
-env.Append(LIBPATH = ['/usr/X11R6/lib'])
 
-env.Append(LIBS = [
-	'm',
-	'pthread',
-	'expat',
-	'dl',
-])
+# Posix
+if platform in ('posix', 'linux', 'freebsd', 'darwin'):
+	env.Append(CPPDEFINES = [
+		'_POSIX_SOURCE',
+		('_POSIX_C_SOURCE', '199309L'), 
+		'_SVID_SOURCE',
+		'_BSD_SOURCE', 
+		'_GNU_SOURCE',
+		
+		'PTHREADS',
+		'HAVE_POSIX_MEMALIGN',
+	])
+	env.Append(CPPPATH = ['/usr/X11R6/include'])
+	env.Append(LIBPATH = ['/usr/X11R6/lib'])
+	env.Append(LIBS = [
+		'm',
+		'pthread',
+		'expat',
+		'dl',
+	])
+
 
 # DRI
 if dri:
-- 
cgit v1.2.3


From 9bcc8ad0caee26cbffba07fcd145392063c5516b Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Mon, 25 Feb 2008 17:05:15 +0900
Subject: Update git ignores.

---
 .gitignore               | 2 ++
 progs/trivial/.gitignore | 1 +
 2 files changed, 3 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index b5e59dfc3e..5c9129535a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 *.a
 *.o
+*.pyc
+*.pyo
 *.so
 *.sw[a-z]
 *~
diff --git a/progs/trivial/.gitignore b/progs/trivial/.gitignore
index cdd04092bd..aafc4a7291 100644
--- a/progs/trivial/.gitignore
+++ b/progs/trivial/.gitignore
@@ -27,6 +27,7 @@ linestrip
 linestrip-flat-stipple
 linestrip-stipple
 linestrip-stipple-wide
+pgon-mode
 point
 point-clip
 point-param
-- 
cgit v1.2.3