From ca8da580a862c4614b49f96926f669fc25103ada Mon Sep 17 00:00:00 2001
From: Chris Want <cwant@ualberta.ca>
Date: Tue, 10 Jan 2006 06:29:57 +0000
Subject: [PATCH] OpenEXR support for Windows Makefiles

---
 source/Makefile                               |  4 ++++
 .../imbuf/intern/openexr/openexr_api.cpp      | 14 ++++++++++++++
 source/nan_definitions.mk                     | 19 +++++++++++++++----
 source/nan_link.mk                            |  6 +-----
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/source/Makefile b/source/Makefile
index 7b073259c8b..87849f29f89 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -218,6 +218,10 @@ ifeq ($(OS), windows)
     endif
 endif
 
+ifeq ($(WITH_OPENEXR), true)
+    COMLIB += $(NAN_OPENEXR_LIBS)
+endif
+
     PULIB = $(NAN_IKSOLVER)/lib/libiksolver.a
     PULIB += $(NAN_MOTO)/lib/libmoto.a
     PULIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index c90278c4514..6e1c31901ce 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -43,6 +43,19 @@ extern "C"
 
 #include <iostream>
 
+#if defined (_WIN32) && !defined(FREE_WINDOWS)
+#include <half.h>
+#include <IlmImf/ImfVersion.h>
+#include <IlmImf/ImfArray.h>
+#include <IlmImf/ImfIO.h>
+#include <IlmImf/ImfChannelList.h>
+#include <IlmImf/ImfPixelType.h>
+#include <IlmImf/ImfInputFile.h>
+#include <IlmImf/ImfOutputFile.h>
+#include <IlmImf/ImfCompression.h>
+#include <IlmImf/ImfCompressionAttribute.h>
+#include <Imath/ImathBox.h>
+#else
 #include <OpenEXR/half.h>
 #include <OpenEXR/ImfVersion.h>
 #include <OpenEXR/ImathBox.h>
@@ -54,6 +67,7 @@ extern "C"
 #include <OpenEXR/ImfOutputFile.h>
 #include <OpenEXR/ImfCompression.h>
 #include <OpenEXR/ImfCompressionAttribute.h>
+#endif
 
 using namespace Imf;
 using namespace Imath;
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index db3d27bcb19..e7e3679f15b 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -94,10 +94,21 @@ endif
     endif
 
     export WITH_OPENEXR ?= true
-    export NAN_OPENEXR ?= /usr/local
-    export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR
-    export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
-
+    ifeq ($(OS),windows)
+      ifeq ($(FREE_WINDOWS), true)
+        export NAN_OPENEXR ?= $(LCGDIR)/gcc/openexr
+        export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
+        export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR
+      else
+        export NAN_OPENEXR ?= $(LCGDIR)/openexr
+        export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/IlmImf.lib $(NAN_OPENEXR)/lib/Half.lib $(NAN_OPENEXR)/lib/Iex.lib
+        export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/IlmImf -I$(NAN_OPENEXR)/include/Imath -I$(NAN_OPENEXR)/include/Iex
+      endif
+    else
+      export NAN_OPENEXR ?= /usr/local
+      export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR
+      export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
+    endif
   # Platform Dependent settings go below:
 
   ifeq ($(OS),beos)
diff --git a/source/nan_link.mk b/source/nan_link.mk
index 1156bf383dc..c201b79a412 100644
--- a/source/nan_link.mk
+++ b/source/nan_link.mk
@@ -59,7 +59,7 @@ ifeq ($(OS),darwin)
     LLIBS    += -lGLU -lGL
     LLIBS    += -lz -lstdc++
     ifdef USE_OSX10.4STUBS
-    	LLIBS    +=-lSystemStubs
+       LLIBS    +=-lSystemStubs
     endif 
     LLIBS    += -framework Carbon -framework AGL -framework OpenGL
     LLIBS    += -framework QuickTime -framework CoreAudio
@@ -157,7 +157,3 @@ endif
 ifneq ($(OS), irix)
    LLIBS += $(NAN_SDLLIBS)
 endif
-
-ifeq ($(WITH_OPENEXR), true)
-    LLIBS += $(NAN_OPENEXR_LIBS)
-endif