Skip to content

Commit 1f54300

Browse files
committed
Update library search orders. Same as nuget branch
1 parent 61aa45e commit 1f54300

1 file changed

Lines changed: 3 additions & 13 deletions

File tree

LSL.cs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -871,29 +871,19 @@ public static void check_error(int ec) {
871871
class dll
872872
{
873873

874-
#if (UNITY_EDITOR_LINUX && UNITY_EDITOR_64) || UNITY_STANDALONE_LINUX
874+
#if (UNITY_EDITOR_LINUX && UNITY_EDITOR_64)
875875
const string libname = "liblsl64.so";
876876
#elif UNITY_EDITOR_LINUX
877877
const string libname = "liblsl32.so";
878-
#elif UNITY_STANDALONE_LINUX
879-
const string libname = "liblsl.so";
880-
#elif Unity_EDITOR_OSX || UNITY_STANDALONE_OSX
881-
//32-bit dylib no longer provided.
882-
const string libname = "liblsl64";
883-
#elif UNITY_STANDALONE_OSX
884-
const string libname = "liblsl";
885878
#elif (UNITY_EDITOR_WIN && UNITY_EDITOR_64)
886879
const string libname = "liblsl64";
887880
#elif UNITY_EDITOR_WIN
888881
const string libname = "liblsl32";
889-
#elif UNITY_STANDALONE_WIN
890-
// a build hook will took care that the correct dll will be renamed after a successfull build
891-
const string libname = "liblsl";
892882
#elif UNITY_ANDROID
893883
const string libname = "lslAndroid";
894884
#else
895-
// Name of the binary to include -- replace this if on non-Windows and non-Unity (e.g., liblsl64.so)
896-
const string libname = "liblsl32.dll";
885+
// Name of the binary to include -- replace this if the native library has a differentname
886+
const string libname = "lsl";
897887
#endif
898888

899889
[DllImport(libname, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi, ExactSpelling = true)]

0 commit comments

Comments
 (0)