diff --git a/Catakig.xcodeproj/project.pbxproj b/Catakig.xcodeproj/project.pbxproj index a37fcc0..0e541d0 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 /* Audio.m in Sources */ = {isa = PBXBuildFile; fileRef = 2835D3360A9794D1002E018A /* Audio.m */; }; + 2835D3370A9794D1002E018A /* Run.m in Sources */ = {isa = PBXBuildFile; fileRef = 2835D3360A9794D1002E018A /* Run.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 */; }; @@ -41,6 +41,7 @@ 289663FE0A90111700A49F71 /* IbsenUtils.ps in Resources */ = {isa = PBXBuildFile; fileRef = 289663F60A90111700A49F71 /* IbsenUtils.ps */; }; 289663FF0A90111700A49F71 /* PrMoLights.icns in Resources */ = {isa = PBXBuildFile; fileRef = 289663F70A90111700A49F71 /* PrMoLights.icns */; }; 289664000A90111700A49F71 /* SpeedLight.icns in Resources */ = {isa = PBXBuildFile; fileRef = 289663F80A90111700A49F71 /* SpeedLight.icns */; }; + 28CEBF9E0ABC6A42001462E9 /* MU-Data.m in Sources */ = {isa = PBXBuildFile; fileRef = 28CEBF9D0ABC6A42001462E9 /* MU-Data.m */; }; 28D98A8F0AAF4EB20012BCAD /* MyApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 28D98A8E0AAF4EB20012BCAD /* MyApplication.m */; }; 28F52FF00A87D7DF00BE8D0C /* IndicatorLight.m in Sources */ = {isa = PBXBuildFile; fileRef = 28F52FE40A87D7DF00BE8D0C /* IndicatorLight.m */; }; 28F52FF20A87D7DF00BE8D0C /* MU-Movie.m in Sources */ = {isa = PBXBuildFile; fileRef = 28F52FE60A87D7DF00BE8D0C /* MU-Movie.m */; }; @@ -78,7 +79,7 @@ 280F4D390A89017C000B3B80 /* ScreenView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreenView.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 = ""; }; + 2835D3360A9794D1002E018A /* Run.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Run.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 = ""; }; @@ -116,6 +117,7 @@ 289663F70A90111700A49F71 /* PrMoLights.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = PrMoLights.icns; sourceTree = ""; }; 289663F80A90111700A49F71 /* SpeedLight.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = SpeedLight.icns; sourceTree = ""; }; 28BD524C0A92B1D600E023D3 /* CPU-RW.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPU-RW.h"; sourceTree = ""; }; + 28CEBF9D0ABC6A42001462E9 /* MU-Data.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MU-Data.m"; sourceTree = ""; }; 28D98A8D0AAF4EB20012BCAD /* MyApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyApplication.h; sourceTree = ""; }; 28D98A8E0AAF4EB20012BCAD /* MyApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyApplication.m; sourceTree = ""; }; 28F52FE30A87D7DF00BE8D0C /* IndicatorLight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndicatorLight.h; sourceTree = ""; }; @@ -134,7 +136,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; explicitFileType = wrapper.application; includeInIndex = 0; path = Catakig.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 8D15AC370486D014006FF6A4 /* Catakig.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Catakig.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -198,7 +200,7 @@ isa = PBXGroup; children = ( 2835D33B0A9795B9002E018A /* Actions.m */, - 2835D3360A9794D1002E018A /* Audio.m */, + 2835D3360A9794D1002E018A /* Run.m */, 287D19910AB4920B00CCB6E2 /* MyDocument.m */, ); path = MyDocument; @@ -278,6 +280,7 @@ 28F52FE30A87D7DF00BE8D0C /* IndicatorLight.h */, 28F52FE40A87D7DF00BE8D0C /* IndicatorLight.m */, 28F52FED0A87D7DF00BE8D0C /* MyUtils.h */, + 28CEBF9D0ABC6A42001462E9 /* MU-Data.m */, 28F52FE60A87D7DF00BE8D0C /* MU-Movie.m */, 2878B28C0A93ABBC0084BF5E /* MU-Object.m */, 283EDFB90A8BAE2100065960 /* MU-OpenGLContext.m */, @@ -422,11 +425,12 @@ 285BF27F0A926BE7003F6BAC /* A2DiskDrive.m in Sources */, 2878B28D0A93ABBC0084BF5E /* MU-Object.m in Sources */, 28736F100A94F6700013975E /* Printing.l in Sources */, - 2835D3370A9794D1002E018A /* Audio.m in Sources */, + 2835D3370A9794D1002E018A /* Run.m in Sources */, 2835D33C0A9795B9002E018A /* Actions.m in Sources */, 2861690D0A9A06A200E398F8 /* MU-UserDefaults.m in Sources */, 28D98A8F0AAF4EB20012BCAD /* MyApplication.m in Sources */, 287D19920AB4920B00CCB6E2 /* MyDocument.m in Sources */, + 28CEBF9E0ABC6A42001462E9 /* MU-Data.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/English.lproj/InfoPlist.strings b/English.lproj/InfoPlist.strings index 38946aa..4eed6cb 100644 Binary files a/English.lproj/InfoPlist.strings and b/English.lproj/InfoPlist.strings differ diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib index 4e281a0..35fbb4d 100644 --- a/English.lproj/MainMenu.nib/info.nib +++ b/English.lproj/MainMenu.nib/info.nib @@ -3,11 +3,11 @@ IBDocumentLocation - 29 163 356 240 0 0 1152 842 + 33 389 356 240 0 0 1152 842 IBEditorPositions 29 - 20 739 396 44 0 0 1152 842 + 130 771 396 44 0 0 1152 842 IBFramework Version 446.1 @@ -15,7 +15,7 @@ 3 IBOpenObjects - 29 + 216 IBSystem Version 8J135 diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib index 9a0f63f..f6d617f 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 aaecdf8..39bacc6 100644 --- a/Info.plist +++ b/Info.plist @@ -38,11 +38,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.00b2 + ${App_Version} CFBundleSignature Ctkg CFBundleVersion - 2.00b2 + ${App_Version} NSMainNibFile MainMenu NSPrincipalClass diff --git a/common.xcconfig b/common.xcconfig index 7b6012a..c897a55 100644 --- a/common.xcconfig +++ b/common.xcconfig @@ -1,11 +1,11 @@ -// 'common.xcconfig' -// Common XCode configration settings for all targets. +// 'common.xcconfig' -- a set of common XCode configration settings +// shared by all targets. +App_Version = 2.00b2 PRODUCT_NAME = Catakig WRAPPER_EXTENSION = app -//CURRENT_PROJECT_VERSION = 2.00b2 -App_Version = 2.00b2 // custom variable +//CURRENT_PROJECT_VERSION = x.x.x INFOPLIST_FILE = Info.plist GCC_PREFIX_HEADER = Source/Prefix.pch @@ -17,9 +17,9 @@ GCC_INPUT_FILETYPE = sourcecode.c.objc // "Compile Sources as" GCC_C_LANGUAGE_STANDARD = c99 GCC_ENABLE_OBJC_EXCEPTIONS = YES -GCC_WARN_UNUSED_VARIABLE = NO -GCC_WARN_ABOUT_RETURN_TYPE = YES +GCC_STRICT_ALIASING = YES +//GCC_VERSION = 4.0 GCC_VERSION_ppc = 4.0 // 3.3 GCC_VERSION_i386 = 4.0 @@ -31,8 +31,17 @@ SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk MACOSX_DEPLOYMENT_TARGET_ppc = 10.3 MACOSX_DEPLOYMENT_TARGET_i386 = 10.4 -OTHER_LDFLAGS = -lz - // -lbz2 +OTHER_LDFLAGS = -lz -lbz2 //OTHER_LDFLAGS = -flag1 -flag2 $(OTHER_LDFLAGS_$(CURRENT_ARCH)) //OTHER_LDFLAGS_ppc = -ppc_specific_flag //OTHER_LDFLAGS_i386 = -intel_specific_flag + +//OTHER_CFLAGS_i386 = -fobjc-direct-dispatch + +// ==== Warnings ==== + +GCC_WARN_UNUSED_VARIABLE = NO +GCC_WARN_ABOUT_RETURN_TYPE = YES +GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES +//GCC_WARN_SIGN_COMPARE = YES + diff --git a/debug.xcconfig b/debug.xcconfig index c22b543..c13fd23 100644 --- a/debug.xcconfig +++ b/debug.xcconfig @@ -1,9 +1,12 @@ #include "common" // file 'common.xcconfig' +ARCHS = $(NATIVE_ARCH) +ZERO_LINK = YES +COPY_PHASE_STRIP = NO + GCC_OPTIMIZATION_LEVEL = 0 GCC_DYNAMIC_NO_PIC = NO GCC_GENERATE_DEBUGGING_SYMBOLS = YES +GCC_ENABLE_FIX_AND_CONTINUE = YES -ZERO_LINK = YES -COPY_PHASE_STRIP = NO -GCC_ENABLE_FIX_AND_CONTINUE = YES +//GCC_PREPROCESSOR_DEFINITIONS = DEBUG $(GCC_PREPROCESSOR_DEFINITIONS) diff --git a/release.xcconfig b/release.xcconfig index c26093d..af398ee 100644 --- a/release.xcconfig +++ b/release.xcconfig @@ -1,10 +1,10 @@ #include "common" // file 'common.xcconfig' -GCC_OPTIMIZATION_LEVEL = s +GCC_OPTIMIZATION_LEVEL = 3 GCC_DYNAMIC_NO_PIC = YES GCC_GENERATE_DEBUGGING_SYMBOLS = NO -ARCHS = ppc i386 +ARCHS = ppc i386 SEPARATE_STRIP = YES DEAD_CODE_STRIPPING = YES