wip fix for jpeg linking issue on macos

octopuscinema · Aug 5, 2024 · 056f6cc · 056f6cc
1 parent 75f27c7
commit 056f6cc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Decoders/Jpeg/GetDependancies.sh b/Decoders/Jpeg/GetDependancies.sh
@@ -12,4 +12,6 @@ curl $libUrl -o $path -L
 mountPoint='/Volumes/libjpeg-turbo'
 hdiutil mount $path -mountpoint $mountPoint
 sudo installer -pkg "${mountPoint}/libjpeg-turbo.pkg" -target /
-hdiutil unmount $mountPoint
+hdiutil unmount $mountPoint
+
+sudo mv /opt/libjpeg-turbo/lib/libjpeg.a /opt/libjpeg-turbo/lib/libjpeg-turbo.a
diff --git a/Decoders/Jpeg/Jpeg.macOS.xcodeproj/project.pbxproj b/Decoders/Jpeg/Jpeg.macOS.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		1102E16C2C59B672008331A4 /* libturbojpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1102E16B2C59B672008331A4 /* libturbojpeg.a */; };
+		111CCE062C6196E60016C16F /* libjpeg-turbo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 111CCE052C6196E60016C16F /* libjpeg-turbo.a */; };
 		11943B4329CA2A0A00078EC3 /* JpegMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = 11943B4229CA2A0A00078EC3 /* JpegMarker.h */; };
 		119B82992C59410700C5FFDC /* LossyJpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 119B82972C59410700C5FFDC /* LossyJpeg.cpp */; };
 		119B829A2C59410700C5FFDC /* LossyJpeg.h in Headers */ = {isa = PBXBuildFile; fileRef = 119B82982C59410700C5FFDC /* LossyJpeg.h */; };
@@ -17,6 +17,7 @@
 
 /* Begin PBXFileReference section */
 		1102E16B2C59B672008331A4 /* libturbojpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libturbojpeg.a; path = "../../../../../../opt/libjpeg-turbo/lib/libturbojpeg.a"; sourceTree = "<group>"; };
+		111CCE052C6196E60016C16F /* libjpeg-turbo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libjpeg-turbo.a"; path = "../../../../../../opt/libjpeg-turbo/lib/libjpeg-turbo.a"; sourceTree = "<group>"; };
 		11943B4229CA2A0A00078EC3 /* JpegMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JpegMarker.h; sourceTree = "<group>"; };
 		119B82972C59410700C5FFDC /* LossyJpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LossyJpeg.cpp; sourceTree = "<group>"; };
 		119B82982C59410700C5FFDC /* LossyJpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LossyJpeg.h; sourceTree = "<group>"; };
@@ -27,11 +28,11 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		11C91698285637D20016B35B /* Frameworks */ = {
+		111CCE032C6194CA0016C16F /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1102E16C2C59B672008331A4 /* libturbojpeg.a in Frameworks */,
+				111CCE062C6196E60016C16F /* libjpeg-turbo.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -62,6 +63,7 @@
 		11F414452C58125D00E26C3A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				111CCE052C6196E60016C16F /* libjpeg-turbo.a */,
 				1102E16B2C59B672008331A4 /* libturbojpeg.a */,
 				11F414462C58125D00E26C3A /* libjpeg.a */,
 			);
@@ -90,7 +92,7 @@
 			buildPhases = (
 				11C91696285637D20016B35B /* Headers */,
 				11C91697285637D20016B35B /* Sources */,
-				11C91698285637D20016B35B /* Frameworks */,
+				111CCE032C6194CA0016C16F /* Frameworks */,
 			);
 			buildRules = (
 			);