diff --git a/profuse.xcodeproj/kelvin.mode1v3 b/profuse.xcodeproj/kelvin.mode1v3 index 81e96f3..ced3f8c 100644 --- a/profuse.xcodeproj/kelvin.mode1v3 +++ b/profuse.xcodeproj/kelvin.mode1v3 @@ -276,14 +276,14 @@ 1AB674ADFE9D54B511CA2CBB B679E49D0F02E71D00FB3F0C 1C37FBAC04509CD000000102 + B6B767D70F0FFDD800D819C9 + 1C37FAAC04509CD000000102 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 7 - 1 - 0 + 24 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey @@ -324,7 +324,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - profuse.1 + fuse_common.h PBXSplitModuleInNavigatorKey Split0 @@ -332,11 +332,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - profuse.1 + fuse_common.h _historyCapacity 0 bookmark - B6DBB4FC0F0C6DE600F385F2 + B6B767E50F0FFE9500D819C9 history B6614B050EFF5F280073C4E7 @@ -345,7 +345,8 @@ B6643BF00F0708B400630102 B634B4FA0F09BFB100D9D93E B6DBB4F10F0C6CD800F385F2 - B6DBB4F20F0C6CD800F385F2 + B6B767C80F0FFA3900D819C9 + B6B767C90F0FFA3900D819C9 prevStack @@ -355,7 +356,7 @@ B60E922B0EFD94CA000E4348 B60E929C0EFDA500000E4348 B679E4BB0F02EFA200FB3F0C - B6DBB4F30F0C6CD800F385F2 + B6B767CB0F0FFA3900D819C9 SplitCount @@ -413,9 +414,9 @@ TableOfContents - B6DBB4DF0F0C6BB400F385F2 + B6B767CD0F0FFA3900D819C9 1CE0B1FE06471DED0097A5F4 - B6DBB4E00F0C6BB400F385F2 + B6B767CE0F0FFA3900D819C9 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -549,9 +550,10 @@ 5 WindowOrderList - B60E918C0EFD7E1E000E4348 1CD10A99069EF8BA00B06720 - /tmp/profuse/profuse.xcodeproj + B60E918C0EFD7E1E000E4348 + /Users/kelvin/Projects/profuse/profuse.xcodeproj + B60E929F0EFDA500000E4348 WindowString 469 354 1212 568 0 0 1920 1178 @@ -575,25 +577,29 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + fuse_common.h StatusBarVisibility GeometryConfiguration Frame - {{0, 0}, {857, 640}} + {{0, 0}, {857, 240}} RubberWindowFrame - 806 164 857 922 0 0 1920 1178 + 352 195 857 922 0 0 1920 1178 Module PBXNavigatorGroup Proportion - 640pt + 240pt + BecomeActive + ContentConfiguration + PBXBuildLogShowsTranscriptDefaultKey + {{0, 245}, {857, 391}} PBXProjectModuleGUID XCMainBuildResultsModuleGUID PBXProjectModuleLabel @@ -606,14 +612,14 @@ GeometryConfiguration Frame - {{0, 645}, {857, 236}} + {{0, 245}, {857, 636}} RubberWindowFrame - 806 164 857 922 0 0 1920 1178 + 352 195 857 922 0 0 1920 1178 Module PBXBuildResultsModule Proportion - 236pt + 636pt Proportion @@ -631,18 +637,18 @@ TableOfContents B60E918C0EFD7E1E000E4348 - B6DBB4F50F0C6CD800F385F2 + B6B767CF0F0FFA3900D819C9 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID ToolbarConfiguration xcode.toolbar.config.buildV3 WindowString - 806 164 857 922 0 0 1920 1178 + 352 195 857 922 0 0 1920 1178 WindowToolGUID B60E918C0EFD7E1E000E4348 WindowToolIsVisible - + FirstTimeWindowDisplayed @@ -751,13 +757,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - B6DBB4E10F0C6BB400F385F2 + B6B767E60F0FFE9500D819C9 1C162984064C10D400B95A72 - B6DBB4E20F0C6BB400F385F2 - B6DBB4E30F0C6BB400F385F2 - B6DBB4E40F0C6BB400F385F2 - B6DBB4E50F0C6BB400F385F2 - B6DBB4E60F0C6BB400F385F2 + B6B767E70F0FFE9500D819C9 + B6B767E80F0FFE9500D819C9 + B6B767E90F0FFE9500D819C9 + B6B767EA0F0FFE9500D819C9 + B6B767EB0F0FFE9500D819C9 ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -983,7 +989,7 @@ PBXProjectModuleGUID 1C78EAB2065D492600B07095 PBXProjectModuleLabel - main.cpp + StatusBarVisibility @@ -1060,7 +1066,7 @@ TableOfContents B60E929F0EFDA500000E4348 - B61846550F0B027E0045CCF7 + B6B767EC0F0FFE9500D819C9 1C78EAB2065D492600B07095 1CD052920623707200166675 @@ -1071,7 +1077,7 @@ WindowToolGUID B60E929F0EFDA500000E4348 WindowToolIsVisible - + Identifier diff --git a/profuse.xcodeproj/kelvin.pbxuser b/profuse.xcodeproj/kelvin.pbxuser index 7e11621..cf6c4c8 100644 --- a/profuse.xcodeproj/kelvin.pbxuser +++ b/profuse.xcodeproj/kelvin.pbxuser @@ -2,7 +2,7 @@ { 08FB7793FE84155DC02AAC07 /* Project object */ = { activeArchitecturePreference = i386; - activeBuildConfigurationName = "Debug Universal"; + activeBuildConfigurationName = Debug; activeExecutable = B60E914A0EFB3612000E4348 /* profuse */; activeTarget = 8DD76F620486A84900D96B5E /* profuse */; addToTargets = ( @@ -87,8 +87,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 252472219; - PBXWorkspaceStateSaveDate = 252472219; + PBXPerProjectTemplateStateSaveDate = 252705002; + PBXWorkspaceStateSaveDate = 252705002; }; perUserProjectItems = { B60E917F0EFD7E1E000E4348 = B60E917F0EFD7E1E000E4348 /* PBXTextBookmark */; @@ -108,13 +108,22 @@ B679E4BB0F02EFA200FB3F0C = B679E4BB0F02EFA200FB3F0C /* PBXTextBookmark */; B6A271C50F040B8E00646F02 = B6A271C50F040B8E00646F02 /* PBXTextBookmark */; B6A271C70F040B8E00646F02 = B6A271C70F040B8E00646F02 /* PBXTextBookmark */; - B6DBB4DE0F0C6BB400F385F2 /* PBXTextBookmark */ = B6DBB4DE0F0C6BB400F385F2 /* PBXTextBookmark */; - B6DBB4F10F0C6CD800F385F2 /* PBXTextBookmark */ = B6DBB4F10F0C6CD800F385F2 /* PBXTextBookmark */; - B6DBB4F20F0C6CD800F385F2 /* PBXBookmark */ = B6DBB4F20F0C6CD800F385F2 /* PBXBookmark */; - B6DBB4F30F0C6CD800F385F2 /* PBXTextBookmark */ = B6DBB4F30F0C6CD800F385F2 /* PBXTextBookmark */; - B6DBB4F40F0C6CD800F385F2 /* PBXTextBookmark */ = B6DBB4F40F0C6CD800F385F2 /* PBXTextBookmark */; - B6DBB4F90F0C6DA600F385F2 /* PBXTextBookmark */ = B6DBB4F90F0C6DA600F385F2 /* PBXTextBookmark */; - B6DBB4FC0F0C6DE600F385F2 /* PBXTextBookmark */ = B6DBB4FC0F0C6DE600F385F2 /* PBXTextBookmark */; + B6B767C80F0FFA3900D819C9 /* PBXTextBookmark */ = B6B767C80F0FFA3900D819C9 /* PBXTextBookmark */; + B6B767C90F0FFA3900D819C9 /* PBXTextBookmark */ = B6B767C90F0FFA3900D819C9 /* PBXTextBookmark */; + B6B767CB0F0FFA3900D819C9 /* PBXTextBookmark */ = B6B767CB0F0FFA3900D819C9 /* PBXTextBookmark */; + B6B767CC0F0FFA3900D819C9 /* PBXTextBookmark */ = B6B767CC0F0FFA3900D819C9 /* PBXTextBookmark */; + B6B767D00F0FFCAF00D819C9 /* PBXTextBookmark */ = B6B767D00F0FFCAF00D819C9 /* PBXTextBookmark */; + B6B767D20F0FFD1A00D819C9 /* PBXTextBookmark */ = B6B767D20F0FFD1A00D819C9 /* PBXTextBookmark */; + B6B767D40F0FFD3F00D819C9 /* PBXTextBookmark */ = B6B767D40F0FFD3F00D819C9 /* PBXTextBookmark */; + B6B767D80F0FFDD800D819C9 /* PBXTextBookmark */ = B6B767D80F0FFDD800D819C9 /* PBXTextBookmark */; + B6B767E50F0FFE9500D819C9 /* PBXTextBookmark */ = B6B767E50F0FFE9500D819C9 /* PBXTextBookmark */; + B6DBB4DE0F0C6BB400F385F2 = B6DBB4DE0F0C6BB400F385F2 /* PBXTextBookmark */; + B6DBB4F10F0C6CD800F385F2 = B6DBB4F10F0C6CD800F385F2 /* PBXTextBookmark */; + B6DBB4F20F0C6CD800F385F2 = B6DBB4F20F0C6CD800F385F2 /* PBXBookmark */; + B6DBB4F30F0C6CD800F385F2 = B6DBB4F30F0C6CD800F385F2 /* PBXTextBookmark */; + B6DBB4F40F0C6CD800F385F2 = B6DBB4F40F0C6CD800F385F2 /* PBXTextBookmark */; + B6DBB4F90F0C6DA600F385F2 = B6DBB4F90F0C6DA600F385F2 /* PBXTextBookmark */; + B6DBB4FC0F0C6DE600F385F2 = B6DBB4FC0F0C6DE600F385F2 /* PBXTextBookmark */; }; sourceControlManager = B60E91500EFB3628000E4348 /* Source Control */; userBuildSettings = { @@ -186,7 +195,7 @@ fallbackIsa = XCSourceControlManager; isSCMEnabled = 0; scmConfiguration = { - repositoryName = ""; + repositoryName = profuse.googlecode.com; }; }; B60E91510EFB3628000E4348 /* Code sense */ = { @@ -448,6 +457,119 @@ path = "/Users/kelvin/Projects/ProDOS-Fuse/pool.h"; sourceTree = ""; }; + B6B767C50F0FF9F500D819C9 /* fuse_common.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = fuse_common.h; + path = /usr/local/include/fuse/fuse_common.h; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {883, 4214}}"; + sepNavSelRange = "{818, 64}"; + sepNavVisRange = "{535, 579}"; + sepNavWindowFrame = "{{15, 249}, {1412, 924}}"; + }; + }; + B6B767C80F0FFA3900D819C9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B6DBB4E70F0C6BBD00F385F2 /* profuse.1 */; + name = "profuse.1: 10"; + rLen = 0; + rLoc = 429; + rType = 0; + vrLen = 722; + vrLoc = 2400; + }; + B6B767C90F0FFA3900D819C9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + comments = "error: #error Please add -D_FILE_OFFSET_BITS=64 to your compile flags!"; + fRef = B6B767CA0F0FFA3900D819C9 /* fuse_common.h */; + rLen = 1; + rLoc = 31; + rType = 1; + }; + B6B767CA0F0FFA3900D819C9 /* fuse_common.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = fuse_common.h; + path = /usr/local/include/fuse/fuse_common.h; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {883, 4214}}"; + sepNavSelRange = "{818, 64}"; + sepNavVisRange = "{535, 579}"; + }; + }; + B6B767CB0F0FFA3900D819C9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B6DBB4E70F0C6BBD00F385F2 /* profuse.1 */; + name = "profuse.1: 10"; + rLen = 0; + rLoc = 429; + rType = 0; + vrLen = 722; + vrLoc = 2400; + }; + B6B767CC0F0FFA3900D819C9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B6B767C50F0FF9F500D819C9 /* fuse_common.h */; + name = "fuse_common.h: 32"; + rLen = 64; + rLoc = 818; + rType = 0; + vrLen = 579; + vrLoc = 535; + }; + B6B767D00F0FFCAF00D819C9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B6B767CA0F0FFA3900D819C9 /* fuse_common.h */; + name = "fuse_common.h: 32"; + rLen = 64; + rLoc = 818; + rType = 0; + vrLen = 579; + vrLoc = 535; + }; + B6B767D20F0FFD1A00D819C9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B6B767CA0F0FFA3900D819C9 /* fuse_common.h */; + name = "fuse_common.h: 32"; + rLen = 64; + rLoc = 818; + rType = 0; + vrLen = 579; + vrLoc = 535; + }; + B6B767D40F0FFD3F00D819C9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B6B767CA0F0FFA3900D819C9 /* fuse_common.h */; + name = "fuse_common.h: 32"; + rLen = 64; + rLoc = 818; + rType = 0; + vrLen = 579; + vrLoc = 535; + }; + B6B767D80F0FFDD800D819C9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B6B767CA0F0FFA3900D819C9 /* fuse_common.h */; + name = "fuse_common.h: 32"; + rLen = 64; + rLoc = 818; + rType = 0; + vrLen = 579; + vrLoc = 535; + }; + B6B767E50F0FFE9500D819C9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B6B767CA0F0FFA3900D819C9 /* fuse_common.h */; + name = "fuse_common.h: 32"; + rLen = 64; + rLoc = 818; + rType = 0; + vrLen = 579; + vrLoc = 535; + }; B6D81E5B0EFDE859000219B7 /* xmain.cpp:163 */ = { isa = PBXFileBreakpoint; actions = ( @@ -477,7 +599,7 @@ }; B6DBB4E70F0C6BBD00F385F2 /* profuse.1 */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {883, 1190}}"; + sepNavIntBoundsRect = "{{0, 0}, {883, 1162}}"; sepNavSelRange = "{429, 0}"; sepNavVisRange = "{2400, 722}"; sepNavWindowFrame = "{{15, 249}, {1412, 924}}"; diff --git a/profuse.xcodeproj/project.pbxproj b/profuse.xcodeproj/project.pbxproj index ef0f3cb..0dde9aa 100644 --- a/profuse.xcodeproj/project.pbxproj +++ b/profuse.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ B60E914F0EFB3628000E4348 /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B60E914E0EFB3628000E4348 /* File.cpp */; }; B60E91550EFB51FE000E4348 /* Disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B60E91540EFB51FE000E4348 /* Disk.cpp */; }; - B679E49B0F02E71400FB3F0C /* libfuse_ino64.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B679E49A0F02E71400FB3F0C /* libfuse_ino64.2.dylib */; }; B679E4A80F02E79300FB3F0C /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B679E4A70F02E79300FB3F0C /* main.cpp */; }; B6AE1D530F033B5E00D36ADB /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6AE1D520F033B5E00D36ADB /* CoreFoundation.framework */; }; /* End PBXBuildFile section */ @@ -33,7 +32,6 @@ B60E91530EFB51FE000E4348 /* Disk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Disk.h; sourceTree = ""; }; B60E91540EFB51FE000E4348 /* Disk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Disk.cpp; sourceTree = ""; }; B60E91580EFD77E3000E4348 /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; }; - B679E49A0F02E71400FB3F0C /* libfuse_ino64.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfuse_ino64.2.dylib; path = /usr/local/lib/libfuse_ino64.2.dylib; sourceTree = ""; }; B679E4A70F02E79300FB3F0C /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; B6AE1D520F033B5E00D36ADB /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; B6DBB4E70F0C6BBD00F385F2 /* profuse.1 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.man; path = profuse.1; sourceTree = ""; }; @@ -44,7 +42,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B679E49B0F02E71400FB3F0C /* libfuse_ino64.2.dylib in Frameworks */, B6AE1D530F033B5E00D36ADB /* CoreFoundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -88,7 +85,6 @@ isa = PBXGroup; children = ( B6AE1D520F033B5E00D36ADB /* CoreFoundation.framework */, - B679E49A0F02E71400FB3F0C /* libfuse_ino64.2.dylib */, ); name = Libraries; sourceTree = ""; @@ -167,7 +163,7 @@ "_GLIBCXX_DEBUG_PEDANTIC=1", ); INSTALL_PATH = /usr/local/bin; - PRODUCT_NAME = "ProDOS-Fuse"; + PRODUCT_NAME = profuse; }; name = Debug; }; @@ -198,6 +194,10 @@ "-D_FILE_OFFSET_BITS=64", "-D__DARWIN_64_BIT_INO_T=1", ); + OTHER_LDFLAGS = ( + "-L/usr/local/lib/", + "-lfuse_ino64", + ); PREBINDING = NO; SDKROOT = macosx10.5; }; @@ -231,6 +231,10 @@ "-D_FILE_OFFSET_BITS=64", "-D__DARWIN_64_BIT_INO_T=1", ); + OTHER_LDFLAGS = ( + "-L/usr/local/lib/", + "-lfuse_ino64", + ); PREBINDING = NO; SDKROOT = macosx10.5; }; @@ -254,6 +258,48 @@ }; name = "Debug Universal"; }; + B6B767C10F0FF90400D819C9 /* Debug Universal 10.4 */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ""; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = /usr/local/include/fuse; + ONLY_ACTIVE_ARCH = NO; + OTHER_CFLAGS = ( + "-D__FreeBSD__=10", + "-D_FILE_OFFSET_BITS=64", + ); + OTHER_LDFLAGS = ( + "-L/usr/local/lib/", + "-lfuse", + ); + PREBINDING = NO; + SDKROOT = macosx10.5; + }; + name = "Debug Universal 10.4"; + }; + B6B767C20F0FF90400D819C9 /* Debug Universal 10.4 */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "_GLIBCXX_DEBUG=1", + "_GLIBCXX_DEBUG_PEDANTIC=1", + ); + INSTALL_PATH = /usr/local/bin; + PRODUCT_NAME = profuse; + }; + name = "Debug Universal 10.4"; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -262,6 +308,7 @@ buildConfigurations = ( 1DEB923208733DC60010E9CD /* Debug */, B618461B0F0AF6CC0045CCF7 /* Debug Universal */, + B6B767C20F0FF90400D819C9 /* Debug Universal 10.4 */, 1DEB923308733DC60010E9CD /* Release */, ); defaultConfigurationIsVisible = 0; @@ -272,6 +319,7 @@ buildConfigurations = ( 1DEB923608733DC60010E9CD /* Debug */, B618461A0F0AF6CC0045CCF7 /* Debug Universal */, + B6B767C10F0FF90400D819C9 /* Debug Universal 10.4 */, 1DEB923708733DC60010E9CD /* Release */, ); defaultConfigurationIsVisible = 0;