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.

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

Support Xcode10, Fix some Crash #13

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
.svn/*
build/*
.svn/
.DS_Store
xcuserdata/
build/
Pods/
.idea/
English.lproj/.svn/all-wcprops
English.lproj/.svn/entries
English.lproj/.svn/text-base/InfoPlist.strings.svn-base
Expand Down
3 changes: 3 additions & 0 deletions DataController.mm
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ -(void)replaceColoumnAtIndex:(NSUInteger)index withString:(NSString *)str
//-----------------------------------------------------------------------------
- (void)writeString:(NSString *)str toFile:(FILE *)pFile
{
if (str == nil) {
return;
}
fwrite(CSTRING(str), [str length] + 1, 1, pFile);
}

Expand Down
16 changes: 10 additions & 6 deletions Document.mm
Original file line number Diff line number Diff line change
Expand Up @@ -455,18 +455,22 @@ - (void)handleThreadStateChanged:(NSNotification *)notification
{
if (OSAtomicIncrement32(&threadCount) == 1)
{
[progressIndicator setUsesThreadedAnimation:YES];
[progressIndicator startAnimation:nil];
[stopButton setHidden:NO];
dispatch_async(dispatch_get_main_queue(), ^{
[progressIndicator setUsesThreadedAnimation:YES];
[progressIndicator startAnimation:nil];
[stopButton setHidden:NO];
});
}
}
else if ([threadState isEqualToString:MVStatusTaskTerminated] == YES)
{
if (OSAtomicDecrement32(&threadCount) == 0)
{
[progressIndicator stopAnimation:nil];
[statusText setStringValue:@""];
[stopButton setHidden:YES];
dispatch_async(dispatch_get_main_queue(), ^{
[progressIndicator stopAnimation:nil];
[statusText setStringValue:@""];
[stopButton setHidden:YES];
});
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>CFBuildDate</key>
<string>Thu Apr 23 12:18:08 WEST 2015</string>
<string>Sun Jan 6 19:27:06 CST 2019</string>
<key>CFBuildNumber</key>
<string>9121</string>
<string>9136</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDocumentTypes</key>
Expand Down Expand Up @@ -44,7 +44,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>9121</string>
<string>9136</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.developer-tools</string>
<key>LSMinimumSystemVersion</key>
Expand Down
3 changes: 3 additions & 0 deletions LinkEdit.mm
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,9 @@ - (MVNode *) createSymbols64Node:parent
// accumulate search info
NSUInteger bookmark = node.details.rowCount;
NSString * symbolName = NSSTRING(strtab + nlist_64->n_un.n_strx);
if (symbolName == nil) {
continue;
}
NSColor * color = nil;

/* print the symbol nr */
Expand Down
8 changes: 2 additions & 6 deletions machoview.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_TEMP_DIR = "$(inherited)";
Expand Down Expand Up @@ -726,9 +725,7 @@
);
PRIVATE_HEADERS_FOLDER_PATH = "";
PRODUCT_NAME = MachOView;
SDKROOT = macosx10.9;
USER_HEADER_SEARCH_PATHS = "";
VALID_ARCHS = "$(inherited)";
VERSIONING_SYSTEM = "";
};
name = Debug;
Expand All @@ -737,7 +734,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_TEMP_DIR = "$(inherited)";
Expand Down Expand Up @@ -781,10 +777,8 @@
);
PRIVATE_HEADERS_FOLDER_PATH = "";
PRODUCT_NAME = MachOView;
SDKROOT = macosx10.9;
SKIP_INSTALL = NO;
USER_HEADER_SEARCH_PATHS = "";
VALID_ARCHS = "$(inherited)";
VERSIONING_SYSTEM = "";
};
name = Release;
Expand All @@ -793,6 +787,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_OBJCPP_ARC_ABI = YES;
CODE_SIGN_IDENTITY = "";
Expand All @@ -818,6 +813,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_OBJCPP_ARC_ABI = YES;
CODE_SIGN_IDENTITY = "";
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>