Embedded NDI lib path on Mac OS to attempt to solve loading problem o…

…n pre Catalina versions
pixsper · May 23, 2020 · c7136c8 · c7136c8
1 parent 652edd2
commit c7136c8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/build/maxmspsdk.xcconfig b/build/maxmspsdk.xcconfig
@@ -40,7 +40,7 @@ ARCHS = x86_64
 //
 // SDKROOT = macosx10.6
 
-MACOSX_DEPLOYMENT_TARGET = 10.9
+MACOSX_DEPLOYMENT_TARGET = 10.12
 
 
 // Compiler Version -- leave them all commented out to get the default version provided by Xcode

diff --git a/build/version.h b/build/version.h
@@ -3,8 +3,8 @@
 
 #define JIT_NDI_VERSION_MAJOR 0
 #define JIT_NDI_VERSION_MINOR 1
-#define JIT_NDI_VERSION_BUGFIX 0
+#define JIT_NDI_VERSION_BUGFIX 1
 
 #define JIT_NDI_COPYRIGHT "Copyright (C) 2020 David Butler / The Impersonal Stereo"
 
-#endif
+#endif
diff --git a/jit.ndi.xcodeproj/project.pbxproj b/jit.ndi.xcodeproj/project.pbxproj
@@ -206,6 +206,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 089C166AFE841209C02AAC07 /* iterator */;
@@ -279,14 +280,12 @@
 		2FBBEAD008F335010078DB84 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
 			};
 			name = Development;
 		};
 		2FBBEAD108F335010078DB84 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
 			};
 			name = Deployment;
 		};

diff --git a/src/ndi_runtime.h b/src/ndi_runtime.h
@@ -99,7 +99,7 @@ bool load_ndi_runtime(NDIlib_v4** ndiLib)
     }
 	else
     {
-		strncpy(ndiRuntimePath, NDILIB_LIBRARY_NAME, MAX_PATH_CHARS);
+        snprintf(ndiRuntimePath, MAX_PATH_CHARS, "%s%s", "/usr/local/lib/", NDILIB_LIBRARY_NAME);
     }
 
     dlerror();
-Original file line number
+Diff line change
@@ Expand Up / @@ -99,7 +99,7 @@ bool load_ndi_runtime(NDIlib_v4** ndiLib) @@
         }
     	else
         {
-    		strncpy(ndiRuntimePath, NDILIB_LIBRARY_NAME, MAX_PATH_CHARS);
+            snprintf(ndiRuntimePath, MAX_PATH_CHARS, "%s%s", "/usr/local/lib/", NDILIB_LIBRARY_NAME);
         }
         dlerror();
@@ Expand Down @@