From 35460fc91cf5311a4cbaee3c577ad8a95ccab1a1 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Fri, 25 Apr 2008 18:16:25 +0900
Subject: scons: Teach scons about user-land windows.

Actually, more like get rid of all our hacks when compiling for
user-land windows.

Only MSVC is supported atm though.
---
 SConstruct | 37 ++-----------------------------------
 1 file changed, 2 insertions(+), 35 deletions(-)

(limited to 'SConstruct')

diff --git a/SConstruct b/SConstruct
index 4785e39ec5..9b46e6ade2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -65,7 +65,7 @@ platform = env['platform']
 # derived options
 x86 = machine == 'x86'
 gcc = platform in ('linux', 'freebsd', 'darwin')
-msvc = platform in ('win32', 'winddk')
+msvc = platform in ('windows', 'winddk')
 
 Export([
 	'debug', 
@@ -84,8 +84,6 @@ Export([
 # TODO: put the compiler specific settings in separate files
 # TODO: auto-detect as much as possible
 
-common.generate(env)
-
 if platform == 'winddk':
 	env.Tool('winddk', ['.'])
 	
@@ -96,37 +94,7 @@ if platform == 'winddk':
 		env['CRT_INC_PATH'],
 	])
 
-# Optimization flags
-if gcc:
-	if debug:
-		env.Append(CFLAGS = '-O0 -g3')
-		env.Append(CXXFLAGS = '-O0 -g3')
-	else:
-		env.Append(CFLAGS = '-O3 -g3')
-		env.Append(CXXFLAGS = '-O3 -g3')
-
-	env.Append(CFLAGS = '-Wall -Wmissing-prototypes -Wno-long-long -ffast-math -pedantic')
-	env.Append(CXXFLAGS = '-Wall -pedantic')
-	
-	# Be nice to Eclipse
-	env.Append(CFLAGS = '-fmessage-length=0')
-	env.Append(CXXFLAGS = '-fmessage-length=0')
-
-if msvc:
-	cflags = [
-		#'/Wp64', # enable 64 bit porting warnings
-	]
-	env.Append(CFLAGS = cflags)
-	env.Append(CXXFLAGS = cflags)
-	# Put debugging information in a separate .pdb file for each object file as
-	# descrived in the scons manpage
-	env['CCPDBFLAGS'] = '/Zi /Fd${TARGET}.pdb'
-
-# Defines
-if debug:
-	env.Append(CPPDEFINES = ['DEBUG'])
-else:
-	env.Append(CPPDEFINES = ['NDEBUG'])
+common.generate(env)
 
 
 # Includes
@@ -188,7 +156,6 @@ if llvm:
 	# See also http://www.scons.org/wiki/UsingPkgConfig
 	env.ParseConfig('llvm-config --cflags --ldflags --libs')
 	env.Append(CPPDEFINES = ['MESA_LLVM'])
-	env.Append(CXXFLAGS = ['-Wno-long-long'])
         # Force C++ linkage
 	env['LINK'] = env['CXX']
 
-- 
cgit v1.2.3


From a7ce6d399221fbb59d96d56c853de9781bbf2547 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Fri, 25 Apr 2008 19:53:13 +0900
Subject: scons: More windows userspace fixes.

---
 SConstruct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'SConstruct')

diff --git a/SConstruct b/SConstruct
index 9b46e6ade2..ea624b13a7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -160,7 +160,7 @@ if llvm:
 	env['LINK'] = env['CXX']
 
 # libGL
-if platform not in ('winddk',):
+if platform in ('linux', 'freebsd', 'darwin'):
 	env.Append(LIBS = [
 		'X11',
 		'Xext',
-- 
cgit v1.2.3


From 658f5e721316f1983ae39b6b94b992baca0e2bc2 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Sat, 26 Apr 2008 01:14:32 +0900
Subject: scons: A few fixes for building mesa on windows.

---
 SConstruct          |  6 ------
 src/mesa/SConscript | 18 ++++++++++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'SConstruct')

diff --git a/SConstruct b/SConstruct
index ea624b13a7..e7c10fcf52 100644
--- a/SConstruct
+++ b/SConstruct
@@ -108,12 +108,6 @@ env.Append(CPPPATH = [
 
 # x86 assembly
 if x86:
-	env.Append(CPPDEFINES = [
-		'USE_X86_ASM', 
-		'USE_MMX_ASM',
-		'USE_3DNOW_ASM',
-		'USE_SSE_ASM',
-	])
 	if gcc:	
 		env.Append(CFLAGS = '-m32')
 		env.Append(CXXFLAGS = '-m32')
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 80fbdb41f0..6b99dacf2a 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -12,9 +12,19 @@ env.Append(CPPPATH = [
 	'#/src/mesa/main',
 ])
 
-env.Append(CFLAGS = [
-	'-std=c99',
-])
+if gcc:
+	env.Append(CFLAGS = [
+		'-std=c99',
+	])
+
+# x86 assembly
+if x86 and gcc:
+	env.Append(CPPDEFINES = [
+		'USE_X86_ASM', 
+		'USE_MMX_ASM',
+		'USE_3DNOW_ASM',
+		'USE_SSE_ASM',
+	])
 
 
 #######################################################################
@@ -269,7 +279,7 @@ SPARC_API = [
 	'sparc/glapi_sparc.S',
 ]
 
-if x86:
+if x86 and gcc:
 	ASM_SOURCES = ASM_C_SOURCES + X86_SOURCES 
 	API_SOURCES = X86_API
 else:
-- 
cgit v1.2.3