X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=4785e39ec566deb2ca80c897cdd51adc27f41382;hb=ac2ca39f8f6024b13b0ddbfe767f9dbc9a528e6c;hp=6f95d123ff26f11f88270ebc01d4dfc58adb618b;hpb=13174c195e057f443b23df788ea0c10251942189;p=mesa.git

diff --git a/SConstruct b/SConstruct
index 6f95d123ff2..4785e39ec56 100644
--- a/SConstruct
+++ b/SConstruct
@@ -55,9 +55,6 @@ env = Environment(
 	ENV = os.environ)
 Help(opts.GenerateHelpText(env))
 
-# for debugging
-#print env.Dump()
-
 # replicate options values in local variables
 debug = env['debug']
 dri = env['dri']
@@ -87,6 +84,7 @@ 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', ['.'])
@@ -115,17 +113,9 @@ if gcc:
 	env.Append(CXXFLAGS = '-fmessage-length=0')
 
 if msvc:
-	env.Append(CFLAGS = '/W3')
-	if debug:
-		cflags = [
-			'/Od', # disable optimizations
-			'/Oy-', # disable frame pointer omission
-		]
-	else:
-		cflags = [
-			'/Ox', # maximum optimizations
-			'/Os', # favor code space
-		]
+	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
@@ -134,14 +124,7 @@ if msvc:
 
 # Defines
 if debug:
-	if gcc:
-		env.Append(CPPDEFINES = ['DEBUG'])
-	if msvc:
-		env.Append(CPPDEFINES = [
-			('DBG', '1'),
-			('DEBUG', '1'),
-			('_DEBUG', '1'),
-		])
+	env.Append(CPPDEFINES = ['DEBUG'])
 else:
 	env.Append(CPPDEFINES = ['NDEBUG'])
 
@@ -206,7 +189,8 @@ if llvm:
 	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']
 
 # libGL
 if platform not in ('winddk',):
@@ -218,8 +202,8 @@ if platform not in ('winddk',):
 		'Xfixes',
 	])
 
-# Convenience library support
-common.createConvenienceLibBuilder(env)
+# for debugging
+#print env.Dump()
 
 Export('env')