Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Mavericks compatibility

Browse Source
This commit is contained in:
Lior Halphon 2020-04-11 18:19:15 +03:00
parent 2bc75caf9e
commit 0c3db932b2
6 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Cocoa/Document.m
View File

@ -817,9 +817,7 @@ static void audioCallback(GB_gameboy_t *gb, GB_sample_t *sample)
} }
if (![console_output_timer isValid]) { if (![console_output_timer isValid]) {
console_output_timer = [NSTimer timerWithTimeInterval:(NSTimeInterval)0.05 repeats:NO block:^(NSTimer * _Nonnull timer) { console_output_timer = [NSTimer timerWithTimeInterval:(NSTimeInterval)0.05 target:self selector:@selector(appendPendingOutput) userInfo:nil repeats:NO];
[self appendPendingOutput];
}];
[[NSRunLoop mainRunLoop] addTimer:console_output_timer forMode:NSDefaultRunLoopMode]; [[NSRunLoop mainRunLoop] addTimer:console_output_timer forMode:NSDefaultRunLoopMode];
} }
@ -1665,7 +1663,7 @@ static void audioCallback(GB_gameboy_t *gb, GB_sample_t *sample)
} }
- (BOOL)splitView:(NSSplitView *)splitView canCollapseSubview:(NSView *)subview; - (BOOL)splitView:(GBSplitView *)splitView canCollapseSubview:(NSView *)subview;
{ {
if ([[splitView arrangedSubviews] lastObject] == subview) { if ([[splitView arrangedSubviews] lastObject] == subview) {
return YES; return YES;
@ -1673,16 +1671,16 @@ static void audioCallback(GB_gameboy_t *gb, GB_sample_t *sample)
return NO; return NO;
} }
- (CGFloat)splitView:(NSSplitView *)splitView constrainMinCoordinate:(CGFloat)proposedMinimumPosition ofSubviewAt:(NSInteger)dividerIndex - (CGFloat)splitView:(GBSplitView *)splitView constrainMinCoordinate:(CGFloat)proposedMinimumPosition ofSubviewAt:(NSInteger)dividerIndex
{ {
return 600; return 600;
} }
- (CGFloat)splitView:(NSSplitView *)splitView constrainMaxCoordinate:(CGFloat)proposedMaximumPosition ofSubviewAt:(NSInteger)dividerIndex { - (CGFloat)splitView:(GBSplitView *)splitView constrainMaxCoordinate:(CGFloat)proposedMaximumPosition ofSubviewAt:(NSInteger)dividerIndex {
return splitView.frame.size.width - 321; return splitView.frame.size.width - 321;
} }
- (BOOL)splitView:(NSSplitView *)splitView shouldAdjustSizeOfSubview:(NSView *)view { - (BOOL)splitView:(GBSplitView *)splitView shouldAdjustSizeOfSubview:(NSView *)view {
if ([[splitView arrangedSubviews] lastObject] == view) { if ([[splitView arrangedSubviews] lastObject] == view) {
return NO; return NO;
} }
@ -1691,7 +1689,7 @@ static void audioCallback(GB_gameboy_t *gb, GB_sample_t *sample)
- (void)splitViewDidResizeSubviews:(NSNotification *)notification - (void)splitViewDidResizeSubviews:(NSNotification *)notification
{ {
NSSplitView *splitview = notification.object; GBSplitView *splitview = notification.object;
if ([[[splitview arrangedSubviews] firstObject] frame].size.width < 600) { if ([[[splitview arrangedSubviews] firstObject] frame].size.width < 600) {
[splitview setPosition:600 ofDividerAtIndex:0]; [splitview setPosition:600 ofDividerAtIndex:0];
} }

2
Cocoa/GBSplitView.h
View File

@ -3,5 +3,5 @@
@interface GBSplitView : NSSplitView @interface GBSplitView : NSSplitView
-(void) setDividerColor:(NSColor *)color; -(void) setDividerColor:(NSColor *)color;
- (NSArray<NSView *> *)arrangedSubviews;
@end @end

10
Cocoa/GBSplitView.m
View File

@ -17,4 +17,14 @@
return [super dividerColor]; return [super dividerColor];
} }
/* Mavericks comaptibility */
- (NSArray<NSView *> *)arrangedSubviews
{
if (@available(macOS 10.11, *)) {
return [super arrangedSubviews];
} else {
return [self subviews];
}
}
@end @end

2
Cocoa/GBViewMetal.m
View File

@ -1,4 +1,6 @@
#import "GBViewMetal.h" #import "GBViewMetal.h"
#pragma clang diagnostic ignored "-Wpartial-availability"
static const vector_float2 rect[] = static const vector_float2 rect[] =
{ {

7
Cocoa/NSObject+MavericksCompat.m Normal file
View File

@ -0,0 +1,7 @@
#import <AppKit/AppKit.h>
@implementation NSObject (MavericksCompat)
- (instancetype)initWithCoder:(NSCoder *)coder
{
return [self init];
}
@end

2
Makefile
View File

@ -88,7 +88,7 @@ OPEN_DIALOG = OpenDialog/cocoa.m
endif endif
CFLAGS += -Werror -Wall -Wno-nonnull -Wno-unused-result -Wno-strict-aliasing -Wno-unknown-warning -Wno-unknown-warning-option -Wno-multichar -Wno-int-in-bool-context -std=gnu11 -D_GNU_SOURCE -DVERSION="$(VERSION)" -I. -D_USE_MATH_DEFINES CFLAGS += -Werror -Wall -Wpartial-availability -Wno-nonnull -Wno-unused-result -Wno-strict-aliasing -Wno-unknown-warning -Wno-unknown-warning-option -Wno-multichar -Wno-int-in-bool-context -std=gnu11 -D_GNU_SOURCE -DVERSION="$(VERSION)" -I. -D_USE_MATH_DEFINES
ifeq (,$(PKG_CONFIG)) ifeq (,$(PKG_CONFIG))
SDL_CFLAGS := $(shell sdl2-config --cflags) SDL_CFLAGS := $(shell sdl2-config --cflags)
SDL_LDFLAGS := $(shell sdl2-config --libs) SDL_LDFLAGS := $(shell sdl2-config --libs)