diff --git a/Blackb0x.xcodeproj/project.pbxproj b/Blackb0x.xcodeproj/project.pbxproj index acda63b..c87c298 100644 --- a/Blackb0x.xcodeproj/project.pbxproj +++ b/Blackb0x.xcodeproj/project.pbxproj @@ -975,7 +975,6 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Blackb0x/Libraries", - "$(LOCAL_LIBRARY_DIR)/Apple/System/Library/PrivateFrameworks", ); GCC_PREFIX_HEADER = Blackb0x/Blackb0x.pch; HEADER_SEARCH_PATHS = ( @@ -1022,7 +1021,6 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Blackb0x/Libraries", - "$(LOCAL_LIBRARY_DIR)/Apple/System/Library/PrivateFrameworks", ); GCC_PREFIX_HEADER = Blackb0x/Blackb0x.pch; HEADER_SEARCH_PATHS = ( diff --git a/Blackb0x.xcodeproj/project.xcworkspace/xcuserdata/spiral.xcuserdatad/UserInterfaceState.xcuserstate b/Blackb0x.xcodeproj/project.xcworkspace/xcuserdata/spiral.xcuserdatad/UserInterfaceState.xcuserstate index 690c9df..8e7bd0f 100644 Binary files a/Blackb0x.xcodeproj/project.xcworkspace/xcuserdata/spiral.xcuserdatad/UserInterfaceState.xcuserstate and b/Blackb0x.xcodeproj/project.xcworkspace/xcuserdata/spiral.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Blackb0x/Libraries/libcbpatcher.a b/Blackb0x/Libraries/libcbpatcher.a old mode 100644 new mode 100755 index d241eb1..d9ff5cc Binary files a/Blackb0x/Libraries/libcbpatcher.a and b/Blackb0x/Libraries/libcbpatcher.a differ diff --git a/Blackb0x/Libraries/libxpwntool.a b/Blackb0x/Libraries/libxpwntool.a old mode 100644 new mode 100755 index 9f7d034..44b96d3 Binary files a/Blackb0x/Libraries/libxpwntool.a and b/Blackb0x/Libraries/libxpwntool.a differ diff --git a/Blackb0x/Source/MainView.m b/Blackb0x/Source/MainView.m index 6a544e9..bd5a5a1 100644 --- a/Blackb0x/Source/MainView.m +++ b/Blackb0x/Source/MainView.m @@ -82,6 +82,7 @@ - (void) spawnDFUHelper { popupSize.width, popupSize.height); if(_dfuHelper == nil) { + /* if (@available(macOS 10.13, *)) { _dfuHelper = [[NSWindow alloc] initWithContentRect:frame styleMask:NSWindowStyleMaskFullSizeContentView @@ -89,11 +90,12 @@ - (void) spawnDFUHelper { defer:NO]; } else { + */ _dfuHelper = [[NSWindow alloc] initWithContentRect:frame styleMask:NSWindowStyleMaskTexturedBackground backing:NSBackingStoreBuffered defer:NO]; - } + //} [_dfuHelper setReleasedWhenClosed:NO]; [_dfuHelper setLevel:NSPopUpMenuWindowLevel]; [_dfuHelper setOpaque:NO]; @@ -130,12 +132,12 @@ - (void) spawnDFUHelper { NSProgressIndicator *progress = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(instructionsFrame.origin.x + instructionsFrame.size.width / 2 - 10, popupSize.height * 0.2 - 10, 20, 20)]; - if (@available(macOS 10.14, *)) { + /*if (@available(macOS 10.14, *)) { progress.style = NSProgressIndicatorStyleSpinning; } - else { + else {*/ progress.style = NSProgressIndicatorSpinningStyle; - } + //} [_dfuHelper.contentView addSubview:progress]; [progress startAnimation:nil]; @@ -150,12 +152,15 @@ - (void) spawnDFUHelper { [_dfuHelper.contentView addSubview: myButton]; [myButton setTitle: @"Cancel"]; + [myButton setBezelStyle:NSRoundedBezelStyle]; + /* if (@available(macOS 10.14, *)) { [myButton setBezelStyle:NSBezelStyleRounded]; } else { [myButton setBezelStyle:NSRoundedBezelStyle]; } + */ [myButton setTarget:self]; [myButton setAction:@selector(popupClose)];