From 7994869b1f0642f6c34c741fb2d09ab0e89e6456 Mon Sep 17 00:00:00 2001 From: Lior Halphon Date: Sat, 7 Dec 2024 00:30:59 +0200 Subject: [PATCH] Minor fixes and oopsies --- Cocoa/Document.xib | 5 +++++ Cocoa/GBOpenGLView.m | 3 ++- Makefile | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Cocoa/Document.xib b/Cocoa/Document.xib index cb106b680..819243030 100644 --- a/Cocoa/Document.xib +++ b/Cocoa/Document.xib @@ -16,11 +16,16 @@ + + + + + diff --git a/Cocoa/GBOpenGLView.m b/Cocoa/GBOpenGLView.m index aa401e882..11c487ffd 100644 --- a/Cocoa/GBOpenGLView.m +++ b/Cocoa/GBOpenGLView.m @@ -29,11 +29,12 @@ - (instancetype)initWithFrame:(NSRect)frameRect pixelFormat:(NSOpenGLPixelFormat *)format { __unsafe_unretained GBOpenGLView *weakSelf = self; + self = [super initWithFrame:frameRect pixelFormat:format]; [self observeStandardDefaultsKey:@"GBFilter" withBlock:^(id newValue) { weakSelf.shader = nil; [weakSelf setNeedsDisplay:true]; }]; - return [super initWithFrame:frameRect pixelFormat:format]; + return self; } @end diff --git a/Makefile b/Makefile index 726567638..98aaf67be 100644 --- a/Makefile +++ b/Makefile @@ -560,7 +560,7 @@ endif $(BIN)/SameBoy.app/Contents/MacOS/SameBoy: $(BIN)/SameBoy.app/Contents/Library/QuickLook/SameBoy.qlgenerator/Contents/MacOS/SameBoy.dylib -@$(MKDIR) -p $(dir $@) - $(CC) $^ -o $@ $(LDFLAGS) $(FAT_FLAGS) -rpath @executable_path/../Library/QuickLook/SameBoy.qlgenerator/ -Wl,-reexport_library,$^ + $(CC) -o $@ $(LDFLAGS) $(FAT_FLAGS) -rpath @executable_path/../Library/QuickLook/SameBoy.qlgenerator/ -Wl,-reexport_library,$^ $(BIN)/SameBoy.app/Contents/Library/QuickLook/SameBoy.qlgenerator/Contents/MacOS/SameBoy.dylib: $(COCOA_OBJECTS) $(CORE_OBJECTS) $(QUICKLOOK_OBJECTS) -@$(MKDIR) -p $(dir $@)