Merge remote-tracking branch 'origin/develop-6.7' into release-6.7.7

livecodesebastien · livecodesebastien · commit 3059f6588588 · 2015-07-30T11:47:41.000+01:00
diff --git a/docs/notes/bugfix-15654.md b/docs/notes/bugfix-15654.md
@@ -0,0 +1 @@
+# LiveCode 6.7.7 RC 1 / 7.1.0 DP 1 won't install on 10.6.8
diff --git a/engine/kernel.gypi b/engine/kernel.gypi
@@ -92,13 +92,22 @@
 							'libraries':
 							[
 								'$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
-								'$(SDKROOT)/System/Library/Frameworks/AVFoundation.framework',
 								'$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
 								'$(SDKROOT)/System/Library/Frameworks/CoreMedia.framework',
 								'$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
 								'$(SDKROOT)/System/Library/Frameworks/Security.framework',
 								'$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
 							],
+							
+							# Adding AVFoundation in the list of libraries does not allow
+							# us to weak link it. Only adding the linking flag does the job
+							'xcode_settings':
+							{
+								'OTHER_LDFLAGS':
+								[
+									'-weak_framework AVFoundation',
+								]
+							},
 						},
 					],
 					[

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# LiveCode 6.7.7 RC 1 / 7.1.0 DP 1 won't install on 10.6.8`