Merge branch 'master' into precompiled_header_proposal

edubois · edubois · commit 63d7039545ef · 2012-07-04T19:03:37.000+02:00
Conflicts:
	__init__.py
diff --git a/__init__.py b/__init__.py
diff --git a/autoconf/boost_unit_test_framework.py b/autoconf/boost_unit_test_framework.py
@@ -9,21 +9,17 @@ def __init__( self ):
         self.language = 'c++',
         self.dependencies=[boost]
 
-    def initOptions(self, project, opts):
-        self.initOption_with(project, opts)
-        return True
-
     def configure(self, project, env):
         if not self.enabled(env):
             return True
         env.Append( CCFLAGS = project.CC['define']+'BOOST_TEST_DYN_LINK' )
         return True
 
     def check(self, project, conf):
-        result = self.CheckLib(conf, self.libs ) #, None, None, self.language)
+        result = self.CheckLib( conf, self.getLibs(conf.env) )
         #or result = self.CheckLib(conf, 'boost_unit_test_framework' ) #, None, None, self.language)
         return result
 
 
-boost_unittestframework = BoostUnittestframeworkChecker()
+boost_unit_test_framework = BoostUnittestframeworkChecker()
 
diff --git a/autoconf/freeglut.py b/autoconf/freeglut.py
@@ -0,0 +1,11 @@
+from _external import *
+from gl import *
+from glu import *
+
+freeglut = LibWithHeaderChecker(
+		'freeglut',
+		['GL/freeglut.h'],
+		'c',
+		dependencies=[gl,glu]
+	)
+
diff --git a/autoconf/glu.py b/autoconf/glu.py
@@ -1,5 +1,10 @@
 from _external import *
 from gl import *
 
-glu = LibWithHeaderChecker('GLU', ['GL/glu.h'], 'c', dependencies=[gl])
+glu = LibWithHeaderChecker(
+		'GLU' if not windows else 'GLU32',
+		['GL/glu.h'],
+		'c',
+		dependencies=[gl]
+	)
 
diff --git a/autoconf/half.py b/autoconf/half.py
@@ -0,0 +1,11 @@
+from _external import *
+from pthread import *
+
+half = LibWithHeaderChecker(
+		['Half'],
+		['OpenEXR/half.h'],
+		'c++',
+		name='half',
+		dependencies=[pthread],
+	    )
+
diff --git a/autoconf/ilmbase.py b/autoconf/ilmbase.py
@@ -1,12 +1,13 @@
 from _external import *
 from pthread import *
+from half import *
 
 ilmbase = LibWithHeaderChecker(
-		['Imath', 'Half', 'Iex', 'IlmThread'],
-		['OpenEXR/Iex.h', 'OpenEXR/IlmBaseConfig.h', 'OpenEXR/ImathVec.h', 'OpenEXR/half.h'],
+		['Imath', 'Iex', 'IlmThread'],
+		['OpenEXR/Iex.h', 'OpenEXR/IlmBaseConfig.h', 'OpenEXR/ImathVec.h'],
 		'c++',
 		name='ilmbase',
-		dependencies=[pthread],
+		dependencies=[pthread, half],
 	    )
 
 
diff --git a/autoconf/m.py b/autoconf/m.py
@@ -1,3 +1,7 @@
 from _external import *
 
-m = LibChecker('m')
+if not windows:
+	m = LibChecker('m')
+else:
+	m = ObjectChecker('m')
+
diff --git a/autoconf/opencolorio.py b/autoconf/opencolorio.py
@@ -1,7 +1,7 @@
 from _external import *
 
 opencolorio = LibWithHeaderChecker(
-            ['OpenColorIO'], 'OpenColorIO.h', 'c++',
+            ['OpenColorIO'], 'OpenColorIO/OpenColorIO.h', 'c++',
             name='opencolorio',
             call='',
             dependencies =[] )
diff --git a/autoconf/qt4.py b/autoconf/qt4.py
@@ -61,7 +61,8 @@ def __init__( self,
 				  defines = ['QT_NO_KEYWORDS'],
 				  useLocalIncludes = True ):
 		self.name  = 'qt4'
-		self.libs = modules[:]
+		postfix = '' if not windows else '4'
+		self.libs = [ m + postfix for m in modules]
 		self.uiFiles =self.getAbsoluteCwd(uiFiles)
 		self.defines = defines[:]
 		self.useLocalIncludes = useLocalIncludes
diff --git a/compiler/__init__.py b/compiler/__init__.py
@@ -1,4 +1,5 @@
 
 import gcc
 import visual
+import clang
 
diff --git a/compiler/clang.py b/compiler/clang.py
@@ -0,0 +1,25 @@
+import os
+import sys
+import gcc
+
+name = 'clang'
+ccBin = 'clang'
+cxxBin = 'clang++'
+linkBin = ccBin
+linkxxBin = cxxBin
+
+def version( bin = 'clang' ):
+	import subprocess
+	try:
+		return subprocess.Popen( [bin, CC['version']], stdout=subprocess.PIPE, stderr=subprocess.PIPE ).communicate()[0].strip()
+	except:
+		return 'unknown'
+
+ccVersionStr = version()
+ccVersion = [0,0,0]
+if ccVersionStr != 'unknown':
+	ccVersion = [int(i) for i in ccVersionStr.split('.')]
+
+# by default, same interface than gcc
+CC = gcc.CC
+
diff --git a/compiler/gcc.py b/compiler/gcc.py
@@ -107,3 +107,11 @@ def version( bin = 'gcc' ):
 CC['base']      = []
 CC['linkbase']  = []
 
+
+
+CC['sse']   = ['-msse']
+CC['sse2']  = ['-msse2']
+CC['sse3']  = ['-msse3']
+CC['ssse3']  = ['-mssse3']
+CC['sse4']  = ['-msse4']
+
diff --git a/compiler/visual.py b/compiler/visual.py
@@ -51,6 +51,12 @@
 CC['linkbase']  = []
 
 
+CC['sse']   = ['/arch:SSE']
+CC['sse2']  = ['/arch:SSE2']
+CC['sse3']  = ['/arch:SSE3']
+CC['ssse3'] = ['/arch:SSSE3']
+CC['sse4']  = ['/arch:SSE4']
+
 def version( bin = 'cl' ):
 	import subprocess
 	try:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`
`2`	`2`	`import gcc`
`3`	`3`	`import visual`
	`4`	`+import clang`
`4`	`5`