Merge pull request #1350 from ericmehl/Imath-fixes

New Imath fixes

Author: johnhaddon

SConstruct

@@ -1019,7 +1019,7 @@ dependencyIncludes = [
 	systemIncludeArgument, "$BLOSC_INCLUDE_PATH",
 	# we use "OpenEXR/x.h" and they use "x.h"
 	systemIncludeArgument, os.path.join( "$OPENEXR_INCLUDE_PATH","OpenEXR" ),
-	systemIncludeArgument, os.path.join( "$ILMBASE_INCLUDE_PATH","OpenEXR" ),
+	systemIncludeArgument, os.path.join( "$ILMBASE_INCLUDE_PATH","Imath" ),
 	systemIncludeArgument, "$FREETYPE_INCLUDE_PATH",
 ]
 
@@ -1128,6 +1128,7 @@ else:
 			"/DWIN32",
 			"/D_WINDOWS",
 			"/DOPENEXR_DLL",
+			"/DIMATH_DLL",
 			"/DNOMINMAX",
 			"/D__PRETTY_FUNCTION__=__FUNCSIG__",
 			"/DBOOST_ALL_DYN_LINK",