Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make enumdisk objc instead of objc++ #66

Merged
merged 1 commit into from
Nov 9, 2023
Merged

Make enumdisk objc instead of objc++ #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fn main() {

fn compile_macos() {
println!("cargo:rerun-if-changed=native/darwin/enumdisk.h");
println!("cargo:rerun-if-changed=native/darwin/enumdisk.mm");
println!("cargo:rerun-if-changed=native/darwin/enumdisk.m");
println!("cargo:rustc-link-search=native/darwin");
println!("cargo:rustc-link-lib=caliguladarwin");

Expand All @@ -22,7 +22,7 @@ fn compile_macos() {

cc::Build::new()
.file("native/darwin/REDiskList.m")
.file("native/darwin/enumdisk.mm")
.file("native/darwin/enumdisk.m")
.include("native/darwin")
.compile("libcaliguladarwin.a");

Expand Down
2 changes: 2 additions & 0 deletions native/darwin/enumdisk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#pragma once

#include <inttypes.h>

const uint8_t DEV_TYPE_FILE = 0;
Expand Down
6 changes: 2 additions & 4 deletions native/darwin/enumdisk.mm → native/darwin/enumdisk.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
// A lot of it was borrowed from: https://github.com/balena-io-modules/drivelist/blob/master/src/darwin/list.mm

extern "C" {
#import "enumdisk.h"
}

#import "REDiskList.h"

#import <inttypes.h>
#import <Cocoa/Cocoa.h>
#import <Foundation/Foundation.h>
#import <DiskArbitration/DiskArbitration.h>
#import "REDiskList.h"

NSNumber *DictionaryGetNumber(CFDictionaryRef dict, const void *key) {
return (NSNumber*)CFDictionaryGetValue(dict, key);
Expand Down