--- ray/build_utils/find_libs.py	2009/10/22 21:16:05	1.5
+++ ray/build_utils/find_libs.py	2018/01/08 13:38:37	1.11
@@ -1,16 +1,33 @@
+from __future__ import division, print_function, unicode_literals
+
 import os
 
 from SCons.SConf import SConf # aka Configure
 
 def find_radlib(env):
-	v = env.FindFile('Verdana.fnt', './lib')
+	v = env.FindFile('helvet.fnt', './lib')
 	if not v:
-		print '''
+		print('''
 	Radiance auxiliary support files not found.
 	-> Download from radiance-online.org and extract.
-	'''
+	''')
 		env.Exit()
 
+def find_pyinstaller(env):
+	if os.name != 'nt':
+		return
+	conf = SConf(env)
+	oldpath = (env['ENV'].get('PATH'))
+	try:
+		env['ENV']['PATH'] = os.environ['PATH']
+		pyinst = conf.CheckProg('pyinstaller.exe')
+		if pyinst:
+			env['PYINSTALLER'] = pyinst
+			env['PYSCRIPTS'] = []
+		env = conf.Finish()
+	finally:
+		env['ENV']['PATH'] = oldpath
+
 def find_x11(env):
 	# Search for libX11, remember the X11 library and include dirs
 	for d in ('/usr/X11R6', '/usr/X11', '/usr/openwin'):
@@ -44,12 +61,22 @@ def find_gl(env):
 		if incdir: env.Prepend(CPPPATH=[incdir]) # add temporarily
 		if libdir: env.Prepend(LIBPATH=[libdir])
 		conf = SConf(env)
-		if conf.CheckLibWithHeader('GL', 'GL/gl.h', 'C', autoadd=0):
+		if (conf.CheckLib('GL')
+				or conf.CheckLib('opengl32')
+				or conf.CheckCHeader('OpenGL/gl.h')
+				or conf.CheckCHeader('GL/gl.h')):
 			env['OGL'] = 1
+		if os.name == 'nt':
+			if (conf.CheckLib('GLU') # for winrview
+					or conf.CheckLib('glu32')
+					or conf.CheckCHeader('OpenGL/glu.h')):
+				env['GLU'] = 1
 		if incdir: env['CPPPATH'].remove(incdir) # not needed for now
 		if libdir: env['LIBPATH'].remove(libdir)
 		if env.has_key('OGL'):
 			if incdir: env.Replace(OGLINCLUDE=[incdir])
+			if env.has_key('GLU'):
+				if incdir: env.Replace(GLUINCLUDE=[incdir])
 			#if libdir: env.Replace(OGLLIB=[libdir])
 			conf.Finish()
 			break
@@ -64,18 +91,26 @@ def find_libtiff(env):
 	if cfgi or cfgl:
 		dl.insert(0,(cfgi, cfgl))
 	for incdir, libdir in dl:
-		if incdir: env.Prepend(CPPPATH=[incdir]) # add temporarily
-		if libdir: env.Prepend(LIBPATH=[libdir])
-		conf = SConf(env)
-		if conf.CheckLib('tiff', 'TIFFInitSGILog',
-				header='void TIFFInitSGILog(void);', autoadd=0):
+		xenv = env.Clone()
+		if incdir: xenv.Prepend(CPPPATH=[incdir]) # add temporarily
+		if libdir:
+			xenv.Prepend(LIBPATH=[libdir])
+			xenv.Prepend(PATH=[libdir])
+		conf = SConf(xenv)
+		libname = 'tiff'
+		if os.name == 'nt':
+			xenv['INCPREFIX'] = '/I ' # Bug in SCons (uses '/I')
+			libname = 'libtiff'
+		if conf.CheckLib(libname, 'TIFFInitSGILog',
+				header='''#include "tiff.h"''', autoadd=0):
 			env['TIFFLIB_INSTALLED'] = 1
-		if incdir: env['CPPPATH'].remove(incdir) # not needed for now
-		if libdir: env['LIBPATH'].remove(libdir)
 		if env.has_key('TIFFLIB_INSTALLED'):
+			env.Replace(RAD_LIBTIFF=libname)
 			if incdir: env.Replace(RAD_TIFFINCLUDE=[incdir])
 			if libdir: env.Replace(RAD_TIFFLIB=[libdir])
 			conf.Finish()
 			break
 		conf.Finish()
+
+# vi: set ts=4 sw=4 :