*sigh* I obviously rushed this. I honestly thought that this commit would
authorKent Mein <mein@cs.umn.edu>
Sat, 12 Mar 2005 16:32:32 +0000 (16:32 +0000)
committerKent Mein <mein@cs.umn.edu>
Sat, 12 Mar 2005 16:32:32 +0000 (16:32 +0000)
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

SConstruct

index 0cbecdfa93758656758af4d38e7a415c02321444..0c7dfb7fbe4eac389e006ef869f55a4d38732a4e 100644 (file)
@@ -247,7 +247,8 @@ elif sys.platform == 'darwin':
        openal_lib = ['libopenal']
        openal_libpath = [darwin_precomp + 'openal/lib']
        openal_include = [darwin_precomp + 'openal/include']
-       if use_openexr == 'false':
+        use_openexr = 'false'
+       if use_openexr == 'true':
                defines += ['WITH_OPENEXR']
 
 elif sys.platform == 'cygwin':
@@ -329,7 +330,8 @@ elif sys.platform == 'cygwin':
        openal_lib = []
        openal_libpath = []
        openal_include = []
-       if use_openexr == 'false':
+        use_openexr = 'false'
+       if use_openexr == 'true':
                defines += ['WITH_OPENEXR']
 
 elif sys.platform == 'win32':
@@ -432,7 +434,8 @@ elif sys.platform == 'win32':
        openal_lib = ['openal_static']
        openal_libpath = ['#../lib/windows/openal/lib']
        openal_include = ['#../lib/windows/openal/include']
-       if use_openexr == 'false':
+        use_openexr = 'false'
+       if use_openexr == 'true':
                defines += ['WITH_OPENEXR']
 
 elif string.find (sys.platform, 'sunos') != -1:
@@ -512,7 +515,8 @@ elif string.find (sys.platform, 'sunos') != -1:
        openal_lib = []
        openal_libpath = []
        openal_include = []
-       if use_openexr == 'false':
+        use_openexr = 'false'
+       if use_openexr == 'true':
                defines += ['WITH_OPENEXR']
 
 elif string.find (sys.platform, 'irix') != -1:
@@ -599,13 +603,15 @@ elif string.find (sys.platform, 'irix') != -1:
        openal_lib = []
        openal_libpath = []
        openal_include = []
-       if use_openexr == 'false':
+        use_openexr = 'false'
+       if use_openexr == 'true':
                defines += ['WITH_OPENEXR']
 
 elif string.find (sys.platform, 'hp-ux') != -1:
        window_system = 'X11'
        defines = []
-       if use_openexr == 'false':
+        use_openexr = 'false'
+       if use_openexr == 'true':
                defines += ['WITH_OPENEXR']
 
 elif sys.platform=='openbsd3':
@@ -686,7 +692,8 @@ elif sys.platform=='openbsd3':
        openal_lib = ['openal']
        openal_libpath = ['/usr/lib']
        openal_include = ['/usr/include']
-       if use_openexr == 'false':
+        use_openexr = 'false'
+       if use_openexr == 'true':
                defines += ['WITH_OPENEXR']
        
 elif sys.platform=='freebsd4' or sys.platform=='freebsd5':
@@ -767,7 +774,8 @@ elif sys.platform=='freebsd4' or sys.platform=='freebsd5':
        openal_lib = ['openal']
        openal_libpath = ['/usr/lib']
        openal_include = ['/usr/include']
-       if use_openexr == 'false':
+        use_openexr = 'false'
+       if use_openexr == 'true':
                defines += ['WITH_OPENEXR']
 
 else: