Skip to content

Commit

Permalink
Merge pull request #6 from glyph/master
Browse files Browse the repository at this point in the history
make it build again on catalina
  • Loading branch information
nevyn authored Aug 24, 2020
2 parents 7f837cc + 1876610 commit 7de29a3
Show file tree
Hide file tree
Showing 17 changed files with 1,427 additions and 7,050 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build
906 changes: 906 additions & 0 deletions Base.lproj/CfxrDocument.xib

Large diffs are not rendered by default.

333 changes: 333 additions & 0 deletions Base.lproj/MainMenu.xib

Large diffs are not rendered by default.

4,776 changes: 0 additions & 4,776 deletions English.lproj/CfxrDocument.xib

This file was deleted.

2,240 changes: 0 additions & 2,240 deletions English.lproj/MainMenu.xib

This file was deleted.

10 changes: 7 additions & 3 deletions Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,26 @@
</array>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>CFBundleIconFile</key>
<string>cfxr</string>
<key>CFBundleIdentifier</key>
<string>eu.thirdcog.cfxr</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.2.1</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key>
<string>3rdC</string>
<key>CFBundleVersion</key>
<string>0.2.1</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.developer-tools</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion Sound.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
@interface Sound : NSManagedObject {
bool filter_on;// = false
}
+(int)countInContext:(NSManagedObjectContext*)ctx;
+(NSUInteger)countInContext:(NSManagedObjectContext*)ctx;
+(int)highestIndexInContext:(NSManagedObjectContext*)ctx;

-(void)generateParamsFromCategory:(NSString*)templateName;
Expand Down
2 changes: 1 addition & 1 deletion Sound.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#import "common.h"

@implementation Sound
+(int)countInContext:(NSManagedObjectContext*)moc;
+(NSUInteger)countInContext:(NSManagedObjectContext*)moc;
{
NSEntityDescription *entityDescription = [NSEntityDescription
entityForName:@"Sound" inManagedObjectContext:moc];
Expand Down
8 changes: 8 additions & 0 deletions cfxr.entitlements
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>com.apple.security.cs.disable-library-validation</key>
<true/>
</dict>
</plist>
146 changes: 117 additions & 29 deletions cfxr.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions cfxr.xcodeproj/project.xcworkspace/contents.xcworkspacedata

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>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "FD0914EA-210A-453F-AFBF-66EB69428C7B"
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "511D1CD8-C555-44CF-A037-7E13CD4CF4AB"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "CfxrDocument.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "133"
endingLineNumber = "133"
landmarkName = "-exportQuickly:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?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>SchemeUserState</key>
<dict>
<key>cfxr.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
</dict>
</plist>
File renamed without changes.
File renamed without changes.

0 comments on commit 7de29a3

Please sign in to comment.