forked from bartvdbraak/blender
*sigh* I obviously rushed this. I honestly thought that this commit would
not affect anyone. Changed: if user_openexr == 'false': defines += ['WITH_OPENEXR'] To what it was suppose to be: user_openexr = 'false': if user_openexr == 'true': defines += ['WITH_OPENEXR'] This was messed up on most platforms, somewhere when adding them all I switched to the bad version and continued with that... I'm on irc if anyone else has any commits to clean this up. I'm going through things and trying to make sure its working for everyone. Sorry, Kent
This commit is contained in:
parent
d3202c5fcc
commit
48b4329170
24
SConstruct
24
SConstruct
@ -247,7 +247,8 @@ elif sys.platform == 'darwin':
|
|||||||
openal_lib = ['libopenal']
|
openal_lib = ['libopenal']
|
||||||
openal_libpath = [darwin_precomp + 'openal/lib']
|
openal_libpath = [darwin_precomp + 'openal/lib']
|
||||||
openal_include = [darwin_precomp + 'openal/include']
|
openal_include = [darwin_precomp + 'openal/include']
|
||||||
if use_openexr == 'false':
|
use_openexr = 'false'
|
||||||
|
if use_openexr == 'true':
|
||||||
defines += ['WITH_OPENEXR']
|
defines += ['WITH_OPENEXR']
|
||||||
|
|
||||||
elif sys.platform == 'cygwin':
|
elif sys.platform == 'cygwin':
|
||||||
@ -329,7 +330,8 @@ elif sys.platform == 'cygwin':
|
|||||||
openal_lib = []
|
openal_lib = []
|
||||||
openal_libpath = []
|
openal_libpath = []
|
||||||
openal_include = []
|
openal_include = []
|
||||||
if use_openexr == 'false':
|
use_openexr = 'false'
|
||||||
|
if use_openexr == 'true':
|
||||||
defines += ['WITH_OPENEXR']
|
defines += ['WITH_OPENEXR']
|
||||||
|
|
||||||
elif sys.platform == 'win32':
|
elif sys.platform == 'win32':
|
||||||
@ -432,7 +434,8 @@ elif sys.platform == 'win32':
|
|||||||
openal_lib = ['openal_static']
|
openal_lib = ['openal_static']
|
||||||
openal_libpath = ['#../lib/windows/openal/lib']
|
openal_libpath = ['#../lib/windows/openal/lib']
|
||||||
openal_include = ['#../lib/windows/openal/include']
|
openal_include = ['#../lib/windows/openal/include']
|
||||||
if use_openexr == 'false':
|
use_openexr = 'false'
|
||||||
|
if use_openexr == 'true':
|
||||||
defines += ['WITH_OPENEXR']
|
defines += ['WITH_OPENEXR']
|
||||||
|
|
||||||
elif string.find (sys.platform, 'sunos') != -1:
|
elif string.find (sys.platform, 'sunos') != -1:
|
||||||
@ -512,7 +515,8 @@ elif string.find (sys.platform, 'sunos') != -1:
|
|||||||
openal_lib = []
|
openal_lib = []
|
||||||
openal_libpath = []
|
openal_libpath = []
|
||||||
openal_include = []
|
openal_include = []
|
||||||
if use_openexr == 'false':
|
use_openexr = 'false'
|
||||||
|
if use_openexr == 'true':
|
||||||
defines += ['WITH_OPENEXR']
|
defines += ['WITH_OPENEXR']
|
||||||
|
|
||||||
elif string.find (sys.platform, 'irix') != -1:
|
elif string.find (sys.platform, 'irix') != -1:
|
||||||
@ -599,13 +603,15 @@ elif string.find (sys.platform, 'irix') != -1:
|
|||||||
openal_lib = []
|
openal_lib = []
|
||||||
openal_libpath = []
|
openal_libpath = []
|
||||||
openal_include = []
|
openal_include = []
|
||||||
if use_openexr == 'false':
|
use_openexr = 'false'
|
||||||
|
if use_openexr == 'true':
|
||||||
defines += ['WITH_OPENEXR']
|
defines += ['WITH_OPENEXR']
|
||||||
|
|
||||||
elif string.find (sys.platform, 'hp-ux') != -1:
|
elif string.find (sys.platform, 'hp-ux') != -1:
|
||||||
window_system = 'X11'
|
window_system = 'X11'
|
||||||
defines = []
|
defines = []
|
||||||
if use_openexr == 'false':
|
use_openexr = 'false'
|
||||||
|
if use_openexr == 'true':
|
||||||
defines += ['WITH_OPENEXR']
|
defines += ['WITH_OPENEXR']
|
||||||
|
|
||||||
elif sys.platform=='openbsd3':
|
elif sys.platform=='openbsd3':
|
||||||
@ -686,7 +692,8 @@ elif sys.platform=='openbsd3':
|
|||||||
openal_lib = ['openal']
|
openal_lib = ['openal']
|
||||||
openal_libpath = ['/usr/lib']
|
openal_libpath = ['/usr/lib']
|
||||||
openal_include = ['/usr/include']
|
openal_include = ['/usr/include']
|
||||||
if use_openexr == 'false':
|
use_openexr = 'false'
|
||||||
|
if use_openexr == 'true':
|
||||||
defines += ['WITH_OPENEXR']
|
defines += ['WITH_OPENEXR']
|
||||||
|
|
||||||
elif sys.platform=='freebsd4' or sys.platform=='freebsd5':
|
elif sys.platform=='freebsd4' or sys.platform=='freebsd5':
|
||||||
@ -767,7 +774,8 @@ elif sys.platform=='freebsd4' or sys.platform=='freebsd5':
|
|||||||
openal_lib = ['openal']
|
openal_lib = ['openal']
|
||||||
openal_libpath = ['/usr/lib']
|
openal_libpath = ['/usr/lib']
|
||||||
openal_include = ['/usr/include']
|
openal_include = ['/usr/include']
|
||||||
if use_openexr == 'false':
|
use_openexr = 'false'
|
||||||
|
if use_openexr == 'true':
|
||||||
defines += ['WITH_OPENEXR']
|
defines += ['WITH_OPENEXR']
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user