Update libs

NSSpiral · Jul 14, 2021 · 21a2f65 · 21a2f65
1 parent a972a60
commit 21a2f65
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git 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/...codeproj/project.xcworkspace/xcuserdata/spiral.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/spiral.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Blackb0x/Libraries/libcbpatcher.a b/Blackb0x/Libraries/libcbpatcher.a
diff --git a/Blackb0x/Libraries/libxpwntool.a b/Blackb0x/Libraries/libxpwntool.a
diff --git a/Blackb0x/Source/MainView.m b/Blackb0x/Source/MainView.m
@@ -82,18 +82,20 @@ - (void) spawnDFUHelper {
                               popupSize.width, popupSize.height);
 
     if(_dfuHelper == nil) {
+        /*
         if (@available(macOS 10.13, *)) {
         _dfuHelper = [[NSWindow alloc] initWithContentRect:frame
                                                  styleMask:NSWindowStyleMaskFullSizeContentView
                                                    backing:NSBackingStoreBuffered
                                                      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)];