From 16ad15075886257dc16050dc3ac6f6fbbac22be1 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Sun, 24 Apr 2011 22:07:46 +0000 Subject: [PATCH] cleanups --- config/config-darwin-universal.py | 2 +- config/config-darwin-x86.py | 2 +- config/config-darwin-x86_64.py | 2 +- config/config-icl11-win32.py | 2 +- config/config-icl11-win64.py | 2 +- config/config-linux.py | 2 +- config/config-msvc2008-win32-debug.py | 2 +- config/config-msvc2008-win32.py | 2 +- config/config-msvc2008-win64-debug.py | 2 +- config/config-msvc2008-win64.py | 2 +- config/config-msvc2010-win32-debug.py | 2 +- config/config-msvc2010-win32.py | 2 +- config/config-msvc2010-win64-debug.py | 2 +- config/config-msvc2010-win64.py | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/config/config-darwin-universal.py b/config/config-darwin-universal.py index d7adf302..8a52a79a 100644 --- a/config/config-darwin-universal.py +++ b/config/config-darwin-universal.py @@ -5,7 +5,7 @@ BASEINCLUDE = ['#include'] BASELIB = ['m', 'pthread', 'gomp'] OEXRINCLUDE = ['#dependencies/darwin/OpenEXR.framework/Headers/OpenEXR'] OEXRLIBDIR = ['#dependencies/darwin/OpenEXR.framework/Resources/lib'] -OEXRLIB = ['Half', 'IlmImf', 'Iex', 'Imath', 'z'] +OEXRLIB = ['Half', 'IlmImf', 'Imath', 'z'] PNGINCLUDE = ['#dependencies/darwin/libpng.framework/Headers'] PNGLIBDIR = ['#dependencies/darwin/libpng.framework/Resources/lib'] PNGLIB = ['png'] diff --git a/config/config-darwin-x86.py b/config/config-darwin-x86.py index 893d9045..efd16456 100644 --- a/config/config-darwin-x86.py +++ b/config/config-darwin-x86.py @@ -5,7 +5,7 @@ BASEINCLUDE = ['#include'] BASELIB = ['m', 'pthread', 'gomp'] OEXRINCLUDE = ['#dependencies/darwin/OpenEXR.framework/Headers/OpenEXR'] OEXRLIBDIR = ['#dependencies/darwin/OpenEXR.framework/Resources/lib'] -OEXRLIB = ['Half', 'IlmImf', 'Iex', 'Imath', 'z'] +OEXRLIB = ['Half', 'IlmImf', 'Imath', 'z'] PNGINCLUDE = ['#dependencies/darwin/libpng.framework/Headers'] PNGLIBDIR = ['#dependencies/darwin/libpng.framework/Resources/lib'] PNGLIB = ['png'] diff --git a/config/config-darwin-x86_64.py b/config/config-darwin-x86_64.py index 6e0ce111..9e8161b8 100644 --- a/config/config-darwin-x86_64.py +++ b/config/config-darwin-x86_64.py @@ -5,7 +5,7 @@ BASEINCLUDE = ['#include'] BASELIB = ['m', 'pthread', 'gomp'] OEXRINCLUDE = ['#dependencies/darwin/OpenEXR.framework/Headers/OpenEXR'] OEXRLIBDIR = ['#dependencies/darwin/OpenEXR.framework/Resources/lib'] -OEXRLIB = ['Half', 'IlmImf', 'Iex', 'Imath', 'z'] +OEXRLIB = ['Half', 'IlmImf', 'Imath', 'z'] PNGINCLUDE = ['#dependencies/darwin/libpng.framework/Headers'] PNGLIBDIR = ['#dependencies/darwin/libpng.framework/Resources/lib'] PNGLIB = ['png'] diff --git a/config/config-icl11-win32.py b/config/config-icl11-win32.py index 371e5af1..d3d0b6f5 100644 --- a/config/config-icl11-win32.py +++ b/config/config-icl11-win32.py @@ -10,7 +10,7 @@ BASEINCLUDE = ['#include', '#dependencies/windows/include'] BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32', 'libmmds'] OEXRINCLUDE = ['#dependencies/windows/include/OpenEXR'] OEXRFLAGS = ['/D', 'OPENEXR_DLL'] -OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half'] +OEXRLIB = ['IlmImf', 'IlmThread', 'zlib1', 'Half'] BOOSTINCLUDE = ['#dependencies'] BOOSTLIB = ['boost_system-vc90-mt-1_44', 'boost_filesystem-vc90-mt-1_44'] COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4'] diff --git a/config/config-icl11-win64.py b/config/config-icl11-win64.py index 0a011b36..57a61a41 100644 --- a/config/config-icl11-win64.py +++ b/config/config-icl11-win64.py @@ -11,7 +11,7 @@ BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32', 'libmmds'] QTDIR = 'C:\\Qt64' OEXRINCLUDE = ['#dependencies/windows/include/OpenEXR'] OEXRFLAGS = ['/D', 'OPENEXR_DLL'] -OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half'] +OEXRLIB = ['IlmImf', 'IlmThread', 'zlib1', 'Half'] BOOSTINCLUDE = ['#dependencies'] BOOSTLIB = ['boost_system-vc90-mt-1_44', 'boost_filesystem-vc90-mt-1_44'] COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4'] diff --git a/config/config-linux.py b/config/config-linux.py index 1a14b7e7..7ab6a121 100644 --- a/config/config-linux.py +++ b/config/config-linux.py @@ -5,7 +5,7 @@ SHLINKFLAGS = ['-rdynamic', '-shared', '-fPIC'] BASEINCLUDE = ['#include'] BASELIB = ['dl', 'm', 'pthread', 'gomp'] OEXRINCLUDE = ['/usr/include/OpenEXR'] -OEXRLIB = ['Half', 'IlmImf', 'Iex', 'z'] +OEXRLIB = ['Half', 'IlmImf', 'z'] PNGLIB = ['png'] JPEGLIB = ['jpeg'] XERCESINCLUDE = [] diff --git a/config/config-msvc2008-win32-debug.py b/config/config-msvc2008-win32-debug.py index 7229b7aa..4973474a 100644 --- a/config/config-msvc2008-win32-debug.py +++ b/config/config-msvc2008-win32-debug.py @@ -12,7 +12,7 @@ BASEINCLUDE = ['#include', '#dependencies/windows/include'] BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32'] OEXRINCLUDE = ['#dependencies/windows/include/OpenEXR'] OEXRFLAGS = ['/D', 'OPENEXR_DLL'] -OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half'] +OEXRLIB = ['IlmImf', 'IlmThread', 'zlib1', 'Half'] BOOSTINCLUDE = ['#dependencies'] BOOSTLIB = ['boost_system-vc90-mt-1_44', 'boost_filesystem-vc90-mt-1_44'] COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4'] diff --git a/config/config-msvc2008-win32.py b/config/config-msvc2008-win32.py index c746da49..a92eb660 100644 --- a/config/config-msvc2008-win32.py +++ b/config/config-msvc2008-win32.py @@ -12,7 +12,7 @@ BASEINCLUDE = ['#include', '#dependencies/windows/include'] BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32'] OEXRINCLUDE = ['#dependencies/windows/include/OpenEXR'] OEXRFLAGS = ['/D', 'OPENEXR_DLL'] -OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half'] +OEXRLIB = ['IlmImf', 'IlmThread', 'zlib1', 'Half'] BOOSTINCLUDE = ['#dependencies'] BOOSTLIB = ['boost_system-vc90-mt-1_44', 'boost_filesystem-vc90-mt-1_44'] COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4'] diff --git a/config/config-msvc2008-win64-debug.py b/config/config-msvc2008-win64-debug.py index 5f614ee8..609f88b9 100644 --- a/config/config-msvc2008-win64-debug.py +++ b/config/config-msvc2008-win64-debug.py @@ -12,7 +12,7 @@ BASEINCLUDE = ['#include', '#dependencies/windows/include'] BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32'] OEXRINCLUDE = ['#dependencies/windows/include/OpenEXR'] OEXRFLAGS = ['/D', 'OPENEXR_DLL'] -OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half'] +OEXRLIB = ['IlmImf', 'IlmThread', 'zlib1', 'Half'] BOOSTINCLUDE = ['#dependencies'] BOOSTLIB = ['boost_system-vc90-mt-1_44', 'boost_filesystem-vc90-mt-1_44'] COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4'] diff --git a/config/config-msvc2008-win64.py b/config/config-msvc2008-win64.py index 77bb6679..d4ce7b6a 100644 --- a/config/config-msvc2008-win64.py +++ b/config/config-msvc2008-win64.py @@ -12,7 +12,7 @@ BASEINCLUDE = ['#include', '#dependencies/windows/include'] BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32'] OEXRINCLUDE = ['#dependencies/windows/include/OpenEXR'] OEXRFLAGS = ['/D', 'OPENEXR_DLL'] -OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half'] +OEXRLIB = ['IlmImf', 'IlmThread', 'zlib1', 'Half'] BOOSTINCLUDE = ['#dependencies'] BOOSTLIB = ['boost_system-vc90-mt-1_44', 'boost_filesystem-vc90-mt-1_44'] COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4'] diff --git a/config/config-msvc2010-win32-debug.py b/config/config-msvc2010-win32-debug.py index f7fde4bf..1d9951cd 100644 --- a/config/config-msvc2010-win32-debug.py +++ b/config/config-msvc2010-win32-debug.py @@ -12,7 +12,7 @@ BASEINCLUDE = ['#include', '#dependencies/windows/include'] BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32'] OEXRINCLUDE = ['#dependencies/windows/include/OpenEXR'] OEXRFLAGS = ['/D', 'OPENEXR_DLL'] -OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half'] +OEXRLIB = ['IlmImf', 'IlmThread', 'zlib1', 'Half'] BOOSTINCLUDE = ['#dependencies'] BOOSTLIB = ['boost_system-vc100-mt-1_44', 'boost_filesystem-vc100-mt-1_44'] COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4'] diff --git a/config/config-msvc2010-win32.py b/config/config-msvc2010-win32.py index 14098c1d..e2ec5d35 100644 --- a/config/config-msvc2010-win32.py +++ b/config/config-msvc2010-win32.py @@ -12,7 +12,7 @@ BASEINCLUDE = ['#include', '#dependencies/windows/include'] BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32'] OEXRINCLUDE = ['#dependencies/windows/include/OpenEXR'] OEXRFLAGS = ['/D', 'OPENEXR_DLL'] -OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half'] +OEXRLIB = ['IlmImf', 'IlmThread', 'zlib1', 'Half'] BOOSTINCLUDE = ['#dependencies'] BOOSTLIB = ['boost_system-vc100-mt-1_44', 'boost_filesystem-vc100-mt-1_44'] COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4'] diff --git a/config/config-msvc2010-win64-debug.py b/config/config-msvc2010-win64-debug.py index 753e9d92..93bbe2f9 100644 --- a/config/config-msvc2010-win64-debug.py +++ b/config/config-msvc2010-win64-debug.py @@ -12,7 +12,7 @@ BASEINCLUDE = ['#include', '#dependencies/windows/include'] BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32'] OEXRINCLUDE = ['#dependencies/windows/include/OpenEXR'] OEXRFLAGS = ['/D', 'OPENEXR_DLL'] -OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half'] +OEXRLIB = ['IlmImf', 'IlmThread', 'zlib1', 'Half'] BOOSTINCLUDE = ['#dependencies'] BOOSTLIB = ['boost_system-vc100-mt-1_44', 'boost_filesystem-vc100-mt-1_44'] COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4'] diff --git a/config/config-msvc2010-win64.py b/config/config-msvc2010-win64.py index 728deedc..772051c5 100644 --- a/config/config-msvc2010-win64.py +++ b/config/config-msvc2010-win64.py @@ -12,7 +12,7 @@ BASEINCLUDE = ['#include', '#dependencies/windows/include'] BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32'] OEXRINCLUDE = ['#dependencies/windows/include/OpenEXR'] OEXRFLAGS = ['/D', 'OPENEXR_DLL'] -OEXRLIB = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half'] +OEXRLIB = ['IlmImf', 'IlmThread', 'zlib1', 'Half'] BOOSTINCLUDE = ['#dependencies'] BOOSTLIB = ['boost_system-vc100-mt-1_44', 'boost_filesystem-vc100-mt-1_44'] COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']