From 0cf37bde8b9d21cb2f7392dab5a91000b89fa6ae Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 4 May 2022 17:51:36 +0100 Subject: [PATCH] Update foreign import for OpenEXRCore for non-windows platforms --- vendor/OpenEXRCore/exr_base.odin | 6 +++++- vendor/OpenEXRCore/exr_chunkio.odin | 6 +++++- vendor/OpenEXRCore/exr_context.odin | 6 +++++- vendor/OpenEXRCore/exr_debug.odin | 6 +++++- vendor/OpenEXRCore/exr_decode.odin | 6 +++++- vendor/OpenEXRCore/exr_encode.odin | 6 +++++- vendor/OpenEXRCore/exr_errors.odin | 7 ++++++- vendor/OpenEXRCore/exr_part.odin | 6 +++++- 8 files changed, 41 insertions(+), 8 deletions(-) diff --git a/vendor/OpenEXRCore/exr_base.odin b/vendor/OpenEXRCore/exr_base.odin index 3301af08b..3c71f6285 100644 --- a/vendor/OpenEXRCore/exr_base.odin +++ b/vendor/OpenEXRCore/exr_base.odin @@ -1,6 +1,10 @@ package vendor_openexr -foreign import lib "OpenEXRCore-3_1.lib" +when ODIN_OS == .Windows { + foreign import lib "OpenEXRCore-3_1.lib" +} else { + foreign import lib "system:OpenEXRCore-3_1" +} import "core:c" diff --git a/vendor/OpenEXRCore/exr_chunkio.odin b/vendor/OpenEXRCore/exr_chunkio.odin index 9ce9d0914..e5fae15f5 100644 --- a/vendor/OpenEXRCore/exr_chunkio.odin +++ b/vendor/OpenEXRCore/exr_chunkio.odin @@ -1,6 +1,10 @@ package vendor_openexr -foreign import lib "OpenEXRCore-3_1.lib" +when ODIN_OS == .Windows { + foreign import lib "OpenEXRCore-3_1.lib" +} else { + foreign import lib "system:OpenEXRCore-3_1" +} import "core:c" diff --git a/vendor/OpenEXRCore/exr_context.odin b/vendor/OpenEXRCore/exr_context.odin index b74986183..4b70950b3 100644 --- a/vendor/OpenEXRCore/exr_context.odin +++ b/vendor/OpenEXRCore/exr_context.odin @@ -1,6 +1,10 @@ package vendor_openexr -foreign import lib "OpenEXRCore-3_1.lib" +when ODIN_OS == .Windows { + foreign import lib "OpenEXRCore-3_1.lib" +} else { + foreign import lib "system:OpenEXRCore-3_1" +} import "core:c" diff --git a/vendor/OpenEXRCore/exr_debug.odin b/vendor/OpenEXRCore/exr_debug.odin index 9b66106d8..e376e9ddd 100644 --- a/vendor/OpenEXRCore/exr_debug.odin +++ b/vendor/OpenEXRCore/exr_debug.odin @@ -1,6 +1,10 @@ package vendor_openexr -foreign import lib "OpenEXRCore-3_1.lib" +when ODIN_OS == .Windows { + foreign import lib "OpenEXRCore-3_1.lib" +} else { + foreign import lib "system:OpenEXRCore-3_1" +} @(link_prefix="exr_", default_calling_convention="c") foreign lib { diff --git a/vendor/OpenEXRCore/exr_decode.odin b/vendor/OpenEXRCore/exr_decode.odin index 97495d407..2065ee44d 100644 --- a/vendor/OpenEXRCore/exr_decode.odin +++ b/vendor/OpenEXRCore/exr_decode.odin @@ -1,6 +1,10 @@ package vendor_openexr -foreign import lib "OpenEXRCore-3_1.lib" +when ODIN_OS == .Windows { + foreign import lib "OpenEXRCore-3_1.lib" +} else { + foreign import lib "system:OpenEXRCore-3_1" +} import "core:c" diff --git a/vendor/OpenEXRCore/exr_encode.odin b/vendor/OpenEXRCore/exr_encode.odin index feedcfc4b..9d9e80c22 100644 --- a/vendor/OpenEXRCore/exr_encode.odin +++ b/vendor/OpenEXRCore/exr_encode.odin @@ -1,6 +1,10 @@ package vendor_openexr -foreign import lib "OpenEXRCore-3_1.lib" +when ODIN_OS == .Windows { + foreign import lib "OpenEXRCore-3_1.lib" +} else { + foreign import lib "system:OpenEXRCore-3_1" +} import "core:c" diff --git a/vendor/OpenEXRCore/exr_errors.odin b/vendor/OpenEXRCore/exr_errors.odin index 882171f00..092b888dc 100644 --- a/vendor/OpenEXRCore/exr_errors.odin +++ b/vendor/OpenEXRCore/exr_errors.odin @@ -1,8 +1,13 @@ package vendor_openexr -foreign import lib "OpenEXRCore-3_1.lib" +when ODIN_OS == .Windows { + foreign import lib "OpenEXRCore-3_1.lib" +} else { + foreign import lib "system:OpenEXRCore-3_1" +} import "core:c" + #assert(size_of(c.int) == size_of(i32)) /** Error codes that may be returned by various functions. */ diff --git a/vendor/OpenEXRCore/exr_part.odin b/vendor/OpenEXRCore/exr_part.odin index 79ebad604..7d7530e50 100644 --- a/vendor/OpenEXRCore/exr_part.odin +++ b/vendor/OpenEXRCore/exr_part.odin @@ -1,6 +1,10 @@ package vendor_openexr -foreign import lib "OpenEXRCore-3_1.lib" +when ODIN_OS == .Windows { + foreign import lib "OpenEXRCore-3_1.lib" +} else { + foreign import lib "system:OpenEXRCore-3_1" +} import "core:c"