diff --git a/Catakig.xcodeproj/project.pbxproj b/Catakig.xcodeproj/project.pbxproj index 71fcb8f..a37fcc0 100644 --- a/Catakig.xcodeproj/project.pbxproj +++ b/Catakig.xcodeproj/project.pbxproj @@ -13,7 +13,7 @@ 280F4D3C0A89017C000B3B80 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 280F4D330A89017C000B3B80 /* main.m */; }; 280F4D3E0A89017C000B3B80 /* PrefsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 280F4D370A89017C000B3B80 /* PrefsPanel.m */; }; 280F4D3F0A89017C000B3B80 /* ScreenView.m in Sources */ = {isa = PBXBuildFile; fileRef = 280F4D390A89017C000B3B80 /* ScreenView.m */; }; - 2835D3370A9794D1002E018A /* MyDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 2835D3360A9794D1002E018A /* MyDocument.m */; }; + 2835D3370A9794D1002E018A /* Audio.m in Sources */ = {isa = PBXBuildFile; fileRef = 2835D3360A9794D1002E018A /* Audio.m */; }; 2835D33C0A9795B9002E018A /* Actions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2835D33B0A9795B9002E018A /* Actions.m */; }; 283EDFBA0A8BAE2100065960 /* MU-OpenGLContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 283EDFB90A8BAE2100065960 /* MU-OpenGLContext.m */; }; 285BF27F0A926BE7003F6BAC /* A2DiskDrive.m in Sources */ = {isa = PBXBuildFile; fileRef = 285BF27C0A926BB2003F6BAC /* A2DiskDrive.m */; }; @@ -31,6 +31,7 @@ 287238870A87B53B006AA610 /* Video.m in Sources */ = {isa = PBXBuildFile; fileRef = 287238820A87B53B006AA610 /* Video.m */; }; 28736F100A94F6700013975E /* Printing.l in Sources */ = {isa = PBXBuildFile; fileRef = 28736F0F0A94F6700013975E /* Printing.l */; }; 2878B28D0A93ABBC0084BF5E /* MU-Object.m in Sources */ = {isa = PBXBuildFile; fileRef = 2878B28C0A93ABBC0084BF5E /* MU-Object.m */; }; + 287D19920AB4920B00CCB6E2 /* MyDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 287D19910AB4920B00CCB6E2 /* MyDocument.m */; }; 288D488F0A8CEB6400327F4A /* ROM.m in Sources */ = {isa = PBXBuildFile; fileRef = 288D488E0A8CEB6400327F4A /* ROM.m */; }; 289663F90A90111700A49F71 /* AboutBoxPanel1.png in Resources */ = {isa = PBXBuildFile; fileRef = 289663F10A90111700A49F71 /* AboutBoxPanel1.png */; }; 289663FA0A90111700A49F71 /* Application.icns in Resources */ = {isa = PBXBuildFile; fileRef = 289663F20A90111700A49F71 /* Application.icns */; }; @@ -75,8 +76,9 @@ 280F4D370A89017C000B3B80 /* PrefsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PrefsPanel.m; sourceTree = ""; }; 280F4D380A89017C000B3B80 /* ScreenView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreenView.h; sourceTree = ""; }; 280F4D390A89017C000B3B80 /* ScreenView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreenView.m; sourceTree = ""; }; - 2818CD090AA4C9790002F245 /* __Notes-to-self.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "__Notes-to-self.txt"; sourceTree = ""; }; - 2835D3360A9794D1002E018A /* MyDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyDocument.m; sourceTree = ""; }; + 28179BED0AB2029E00686944 /* XCode.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = XCode.txt; sourceTree = ""; }; + 2818CD090AA4C9790002F245 /* Notes-to-self.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Notes-to-self.txt"; sourceTree = ""; }; + 2835D3360A9794D1002E018A /* Audio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Audio.m; sourceTree = ""; }; 2835D33B0A9795B9002E018A /* Actions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Actions.m; sourceTree = ""; }; 283EDFB90A8BAE2100065960 /* MU-OpenGLContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MU-OpenGLContext.m"; sourceTree = ""; }; 285BF2460A926901003F6BAC /* CPU-Macros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPU-Macros.h"; sourceTree = ""; }; @@ -101,6 +103,7 @@ 287238820A87B53B006AA610 /* Video.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Video.m; sourceTree = ""; }; 28736F0F0A94F6700013975E /* Printing.l */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.lex; path = Printing.l; sourceTree = ""; }; 2878B28C0A93ABBC0084BF5E /* MU-Object.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MU-Object.m"; sourceTree = ""; }; + 287D19910AB4920B00CCB6E2 /* MyDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyDocument.m; sourceTree = ""; }; 288B38700A9604DF00D20934 /* To-do-Cocoa.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "To-do-Cocoa.txt"; sourceTree = ""; }; 288B38710A9604DF00D20934 /* To-do-LibAppleII.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "To-do-LibAppleII.txt"; sourceTree = ""; }; 288D488E0A8CEB6400327F4A /* ROM.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ROM.m; sourceTree = ""; }; @@ -131,7 +134,7 @@ 2A37F4B7FDCFA73011CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = ""; }; 2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; - 8D15AC370486D014006FF6A4 /* Catakig.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Catakig.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 8D15AC370486D014006FF6A4 /* Catakig.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Catakig.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -194,8 +197,9 @@ 2835D3350A9794D1002E018A /* MyDocument */ = { isa = PBXGroup; children = ( - 2835D3360A9794D1002E018A /* MyDocument.m */, 2835D33B0A9795B9002E018A /* Actions.m */, + 2835D3360A9794D1002E018A /* Audio.m */, + 287D19910AB4920B00CCB6E2 /* MyDocument.m */, ); path = MyDocument; sourceTree = ""; @@ -245,9 +249,10 @@ 288B386F0A9604DF00D20934 /* Notes */ = { isa = PBXGroup; children = ( - 2818CD090AA4C9790002F245 /* __Notes-to-self.txt */, + 2818CD090AA4C9790002F245 /* Notes-to-self.txt */, 288B38700A9604DF00D20934 /* To-do-Cocoa.txt */, 288B38710A9604DF00D20934 /* To-do-LibAppleII.txt */, + 28179BED0AB2029E00686944 /* XCode.txt */, ); path = Notes; sourceTree = ""; @@ -417,10 +422,11 @@ 285BF27F0A926BE7003F6BAC /* A2DiskDrive.m in Sources */, 2878B28D0A93ABBC0084BF5E /* MU-Object.m in Sources */, 28736F100A94F6700013975E /* Printing.l in Sources */, - 2835D3370A9794D1002E018A /* MyDocument.m in Sources */, + 2835D3370A9794D1002E018A /* Audio.m in Sources */, 2835D33C0A9795B9002E018A /* Actions.m in Sources */, 2861690D0A9A06A200E398F8 /* MU-UserDefaults.m in Sources */, 28D98A8F0AAF4EB20012BCAD /* MyApplication.m in Sources */, + 287D19920AB4920B00CCB6E2 /* MyDocument.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/English.lproj/MainMenu.nib/classes.nib b/English.lproj/MainMenu.nib/classes.nib index 9a4fd46..6bcded6 100644 --- a/English.lproj/MainMenu.nib/classes.nib +++ b/English.lproj/MainMenu.nib/classes.nib @@ -7,10 +7,9 @@ SUPERCLASS = NSPanel; }, { - ACTIONS = {newDocument = id; }; CLASS = AppController; LANGUAGE = ObjC; - OUTLETS = {mNewA2ExtraRAM = NSControl; mNewA2Model = NSControl; mNewA2Panel = NSPanel; }; + OUTLETS = {mNewA2ExtraRAM = NSControl; mNewA2Model = NSMatrix; mNewA2Panel = NSPanel; }; SUPERCLASS = NSObject; }, { @@ -31,6 +30,7 @@ LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = MyApplication; LANGUAGE = ObjC; SUPERCLASS = NSApplication; }, {CLASS = NSMovie; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = NSOpenGLView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, { diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib index d4e80a8..4e281a0 100644 --- a/English.lproj/MainMenu.nib/info.nib +++ b/English.lproj/MainMenu.nib/info.nib @@ -7,7 +7,7 @@ IBEditorPositions 29 - 42 710 396 44 0 0 1152 842 + 20 739 396 44 0 0 1152 842 IBFramework Version 446.1 diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib index 886d9fa..9a0f63f 100644 Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/Info.plist b/Info.plist index 17d33b8..aaecdf8 100644 --- a/Info.plist +++ b/Info.plist @@ -37,6 +37,8 @@ ${PRODUCT_NAME} CFBundlePackageType APPL + CFBundleShortVersionString + 2.00b2 CFBundleSignature Ctkg CFBundleVersion diff --git a/common.xcconfig b/common.xcconfig index 6c53f0d..7b6012a 100644 --- a/common.xcconfig +++ b/common.xcconfig @@ -1,17 +1,16 @@ // 'common.xcconfig' -// Common configration settings for all targets. +// Common XCode configration settings for all targets. PRODUCT_NAME = Catakig WRAPPER_EXTENSION = app //CURRENT_PROJECT_VERSION = 2.00b2 -//APP_VERSION = 2.00b2 // custom variable +App_Version = 2.00b2 // custom variable INFOPLIST_FILE = Info.plist GCC_PREFIX_HEADER = Source/Prefix.pch GCC_PRECOMPILE_PREFIX_HEADER = YES -GCC_PFE_FILE_C_DIALECTS = objective-c - // c +GCC_PFE_FILE_C_DIALECTS = c objective-c GCC_INPUT_FILETYPE = sourcecode.c.objc //GCC_INPUT_FILETYPE = automatic diff --git a/release.xcconfig b/release.xcconfig index b939c13..c26093d 100644 --- a/release.xcconfig +++ b/release.xcconfig @@ -1,6 +1,6 @@ #include "common" // file 'common.xcconfig' -GCC_OPTIMIZATION_LEVEL = 3 +GCC_OPTIMIZATION_LEVEL = s GCC_DYNAMIC_NO_PIC = YES GCC_GENERATE_DEBUGGING_SYMBOLS = NO