macosx: Cleanup list of frameworks and includes

Framework umbrella headers are now included where they are used.
Explicit includes where added where the code relied on implicit
includes.

Reorder list of framework the macosx module needs, and clean it up:
Removed:
- CoreServices (not used)
- CoreMedia (not used, replaced by CoreAudio and CoreVideo)
- SystemConfiguration (was used in 3.0.x for title bar, not used anymore)
This commit is contained in:
David Fuhrmann 2022-11-01 09:12:56 +01:00 committed by Felix Paul Kühne
parent 7acec9d54a
commit 00ea7a3f54
5 changed files with 15 additions and 6 deletions

View File

@ -15,11 +15,15 @@ xib_verbose__0 = $(xib_verbose_0)
libmacosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions -fobjc-arc -I$(srcdir)/gui/macosx
libmacosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' \
-Wl,-framework,Cocoa -Wl,-framework,CoreServices \
-Wl,-framework,AVFoundation -Wl,-framework,CoreMedia -Wl,-framework,IOKit \
-Wl,-framework,WebKit -Wl,-framework,CoreAudio \
-Wl,-framework,SystemConfiguration -Wl,-framework,ScriptingBridge \
-Wl,-framework,QuartzCore -Wl,-weak_framework,MediaPlayer
-Wl,-framework,AVFoundation \
-Wl,-framework,Cocoa \
-Wl,-framework,CoreAudio \
-Wl,-framework,CoreVideo \
-Wl,-framework,IOKit \
-Wl,-framework,QuartzCore \
-Wl,-framework,ScriptingBridge \
-Wl,-framework,WebKit \
-Wl,-weak_framework,MediaPlayer
if HAVE_SPARKLE
libmacosx_plugin_la_LDFLAGS += -Wl,-framework,Sparkle

View File

@ -20,6 +20,7 @@
*/
#import <AudioToolbox/AudioToolbox.h>
#import <CoreAudio/CoreAudio.h>
#import "VLCSystemVolume.h"
#import "main/VLCMain.h"

View File

@ -21,6 +21,9 @@
*****************************************************************************/
#import "VLCImageView.h"
#import <QuartzCore/QuartzCore.h>
#import "extensions/NSColor+VLCAdditions.h"
#import "extensions/NSView+VLCAdditions.h"

View File

@ -21,7 +21,6 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import <QuartzCore/QuartzCore.h>
@interface VLCSliderCell : NSSliderCell

View File

@ -22,6 +22,8 @@
#import "VLCSliderCell.h"
#import <CoreVideo/CoreVideo.h>
#import "extensions/NSGradient+VLCAdditions.h"
#import "extensions/NSColor+VLCAdditions.h"
#import "main/CompatibilityFixes.h"