Renamed OpenImageIO.dll to OpenImageIO_LuxCore.dll to avoid potential conflicts with other software

acasta69 · acasta69 · commit 5ed43703c643 · 2021-02-08T21:48:26.000+01:00
diff --git a/include/OpenImageIO/export.h b/include/OpenImageIO/export.h
@@ -85,7 +85,7 @@
   #define OIIO_LOCAL  __attribute__ ((visibility ("hidden")))
 #endif
 
-#if defined(OpenImageIO_EXPORTS) || defined(OpenImageIO_Util_EXPORTS)
+#if defined(OpenImageIO_LuxCore_EXPORTS) || defined(OpenImageIO_Util_EXPORTS)
 #  define OIIO_API OIIO_EXPORT
 #else
 #  define OIIO_API OIIO_IMPORT
diff --git a/include/OpenImageIO/oiioversion.h b/include/OpenImageIO/oiioversion.h
@@ -56,13 +56,13 @@
 
 
 // Establish the name spaces
-namespace OpenImageIO_v1_8 { }
-namespace OIIO = OpenImageIO_v1_8;
+namespace OpenImageIO_LuxCore_v1_8 { }
+namespace OIIO = OpenImageIO_LuxCore_v1_8;
 
 // Macros to use in each file to enter and exit the right name spaces.
-#define OIIO_NAMESPACE OpenImageIO_v1_8
-#define OIIO_NAMESPACE_STRING "OpenImageIO_v1_8"
-#define OIIO_NAMESPACE_BEGIN namespace OpenImageIO_v1_8 {
+#define OIIO_NAMESPACE OpenImageIO_LuxCore_v1_8
+#define OIIO_NAMESPACE_STRING "OpenImageIO_LuxCore_v1_8"
+#define OIIO_NAMESPACE_BEGIN namespace OpenImageIO_LuxCore_v1_8 {
 #define OIIO_NAMESPACE_END }
 #define OIIO_NAMESPACE_USING using namespace OIIO;
 
diff --git a/x64/Release/lib/OpenImageIO.dll b/x64/Release/lib/OpenImageIO.dll
diff --git a/x64/Release/lib/OpenImageIO.lib b/x64/Release/lib/OpenImageIO.lib
diff --git a/x64/Release/lib/OpenImageIO_LuxCore.dll b/x64/Release/lib/OpenImageIO_LuxCore.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6793f1ea2740468b09a196df52a188dc79509244cefcdfd187c44ea16189b162
+size 13008384
diff --git a/x64/Release/lib/OpenImageIO_LuxCore.lib b/x64/Release/lib/OpenImageIO_LuxCore.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5202ac0053b67f766afc098de115618949c189285b314530e20524740e7d540a
+size 897990

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:6793f1ea2740468b09a196df52a188dc79509244cefcdfd187c44ea16189b162`
	`3`	`+size 13008384`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:5202ac0053b67f766afc098de115618949c189285b314530e20524740e7d540a`
	`3`	`+size 897990`