From cbc337d925584c6ef17b9e76556de8ed1f5fbd59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Sat, 9 Feb 2008 17:48:10 +0000
Subject: [PATCH] have libilmimf built with libstdc++v2 added EXRTranslator to
 the image

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23936 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/HaikuImage                               | 3 ++-
 src/add-ons/translators/exr/EXRGamma.cpp           | 2 ++
 src/add-ons/translators/exr/Jamfile                | 2 +-
 src/add-ons/translators/exr/openexr/half/Jamfile   | 4 ++++
 src/add-ons/translators/exr/openexr/ilmimf/Jamfile | 4 ++++
 src/add-ons/translators/exr/openexr/imath/Jamfile  | 4 ++++
 6 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 00a2c7b351..ef1169802f 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -66,6 +66,7 @@ BEOS_SYSTEM_LIBS = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so
 	libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so libmidi2.so
 	libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so
 	$(X86_ONLY)libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so
+	libilmimf.so
 ;
 BEOS_SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server
 	net_server media_addon_server input_server app_server fake_app_server
@@ -84,7 +85,7 @@ BEOS_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant $(X86_ONLY)nvidia.accele
 	$(X86_ONLY)via.accelerant
 	#$(X86_ONLY)vmware.accelerant
 ;
-BEOS_ADD_ONS_TRANSLATORS = BMPTranslator GIFTranslator JPEGTranslator
+BEOS_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator JPEGTranslator
 	JPEG2000Translator TIFFTranslator PNGTranslator PPMTranslator 
 	RTF-Translator SGITranslator STXTTranslator TGATranslator
 	WonderBrushTranslator RAWTranslator
diff --git a/src/add-ons/translators/exr/EXRGamma.cpp b/src/add-ons/translators/exr/EXRGamma.cpp
index 0006b8668b..639600592c 100644
--- a/src/add-ons/translators/exr/EXRGamma.cpp
+++ b/src/add-ons/translators/exr/EXRGamma.cpp
@@ -8,6 +8,8 @@
 #include "ImathFun.h"
 #include "ImathMath.h"
 
+#include <algorithm>
+
 using namespace std;
 using Imath::clamp;
 
diff --git a/src/add-ons/translators/exr/Jamfile b/src/add-ons/translators/exr/Jamfile
index 955d98ffc4..aa04531da2 100644
--- a/src/add-ons/translators/exr/Jamfile
+++ b/src/add-ons/translators/exr/Jamfile
@@ -20,7 +20,7 @@ Translator EXRTranslator :
 	TranslatorSettings.cpp
 	TranslatorWindow.cpp
 
-	: be translation libilmimf.so
+	: be translation libilmimf.so $(TARGET_LIBSTDC++)
 	: true
 ;
 
diff --git a/src/add-ons/translators/exr/openexr/half/Jamfile b/src/add-ons/translators/exr/openexr/half/Jamfile
index 46da0c4858..4c29c93e72 100644
--- a/src/add-ons/translators/exr/openexr/half/Jamfile
+++ b/src/add-ons/translators/exr/openexr/half/Jamfile
@@ -2,6 +2,10 @@ SubDir HAIKU_TOP src add-ons translators exr openexr half ;
 
 SubDirSysHdrs [ FDirName $(SUBDIR) ] ;
 
+if $(HAIKU_LIBSTDC++) = libstdc++.r4.so {
+	SubDirC++Flags -Dios_base=ios -ftemplate-depth-24 ;
+}
+
 StaticLibrary libhalf.a :
 eLut.cpp
 half.cpp
diff --git a/src/add-ons/translators/exr/openexr/ilmimf/Jamfile b/src/add-ons/translators/exr/openexr/ilmimf/Jamfile
index 04258be9b6..3bbe147182 100644
--- a/src/add-ons/translators/exr/openexr/ilmimf/Jamfile
+++ b/src/add-ons/translators/exr/openexr/ilmimf/Jamfile
@@ -7,6 +7,10 @@ SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) ilmthread ] ;
 SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) imath ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) config ] ;
 
+if $(HAIKU_LIBSTDC++) = libstdc++.r4.so {
+	SubDirC++Flags -Dios_base=ios -ftemplate-depth-24 ;
+}
+
 UseLibraryHeaders zlib ;
 
 #StaticLibrary libilmimf.a :
diff --git a/src/add-ons/translators/exr/openexr/imath/Jamfile b/src/add-ons/translators/exr/openexr/imath/Jamfile
index 5154265dfd..8a6215ef91 100644
--- a/src/add-ons/translators/exr/openexr/imath/Jamfile
+++ b/src/add-ons/translators/exr/openexr/imath/Jamfile
@@ -4,6 +4,10 @@ SubDirSysHdrs [ FDirName $(SUBDIR) ] ;
 SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) half ] ;
 SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) iex ] ;
 
+if $(HAIKU_LIBSTDC++) = libstdc++.r4.so {
+        SubDirC++Flags -Dios_base=ios -ftemplate-depth-24 ;
+}
+
 StaticLibrary libimath.a :
 ImathBox.cpp
 ImathColorAlgo.cpp