From: Marc Liyanage Date: Sun, 13 Feb 2005 13:16:18 +0000 (+0000) Subject: fixed hard-coded lib search paths, added ranlib custom script build phase X-Git-Tag: v1.2~4 X-Git-Url: http://www.entropy.ch/git/LeanCalc.git/commitdiff_plain/874e5d173ba5c746ee27a1f736b20efb79abde15 fixed hard-coded lib search paths, added ranlib custom script build phase git-svn-id: svn+ssh://www.entropy.ch/Users/liyanage/Documents/svnroot/trunk/LeanCalc@131 153f8dbc-cef0-0310-8e0e-ba1d6c9f8c6b --- diff --git a/LeanCalc.xcode/liyanage.mode1 b/LeanCalc.xcode/liyanage.mode1 index 0dcbab0..f626b2c 100644 --- a/LeanCalc.xcode/liyanage.mode1 +++ b/LeanCalc.xcode/liyanage.mode1 @@ -265,13 +265,14 @@ 2A37F4C3FDCFA73011CA2CEA 1058C7A6FEA54F5311CA2CBB 1C37FBAC04509CD000000102 + 1B82477C07BF8A4C00279D6D 1C37FABC05509CD000000102 1CC0EA4004350EF90041110B PBXSmartGroupTreeModuleOutlineStateSelectionKey - 3 + 4 2 0 @@ -318,40 +319,29 @@ PBXProjectModuleLabel LeanCalc_Prefix.pch bookmark - 1B8243EF07BF879700279D6D + 1B82478C07BF8A7600279D6D history 1BD2F3F207B74F230022B69D - 1BC8F72507B97E7C00987A06 - 1BD2F45007B829610022B69D 1B82418207BE13B000279D6D 1B82427B07BF61C600279D6D 1B82434A07BF7A4B00279D6D 1B8243C007BF863D00279D6D 1B8243C407BF865300279D6D - 1B8243C507BF865300279D6D 1B8243E107BF86BE00279D6D - 1B8243E707BF86C900279D6D - 1B8243E807BF86C900279D6D + 1B82478907BF8A7600279D6D + 1B82478A07BF8A7600279D6D prevStack 1BD2F3F507B74F230022B69D 1BD2F45307B829610022B69D - 1BD2F45407B829610022B69D 1BC8F14907B8301200987A06 - 1BC8F72C07B97E7C00987A06 1BADE91E07BC0E6C0020BE61 - 1B82418507BE13B000279D6D - 1B82427E07BF61C600279D6D 1B82427F07BF61C600279D6D - 1B82429107BF677B00279D6D - 1B8242D207BF6C9D00279D6D - 1B82434F07BF7A4B00279D6D - 1B8243C207BF863D00279D6D 1B8243C607BF865300279D6D 1B8243E307BF86BE00279D6D - 1B8243E907BF86C900279D6D + 1B82478B07BF8A7600279D6D SplitCount @@ -409,9 +399,9 @@ TableOfContents - 1B82411B07BD690200279D6D + 1B82477F07BF8A4C00279D6D 1CE0B1FE06471DED0097A5F4 - 1B82411C07BD690200279D6D + 1B82478007BF8A4C00279D6D 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -424,7 +414,7 @@ StatusbarIsVisible TimeStamp - 129992599.06281091 + 129993334.12741338 ToolbarDisplayMode 1 ToolbarIsVisible @@ -439,9 +429,9 @@ 5 WindowOrderList - 1B82411E07BD690200279D6D + 1B82478107BF8A4C00279D6D 1C0AD2B3069F1EA900FABCE6 - /Users/liyanage/Desktop/LeanCalc/LeanCalc.xcode + /Users/liyanage/cvs/entropy/LeanCalc/LeanCalc.xcode WindowString 78 157 900 694 0 0 1440 878 @@ -470,14 +460,6 @@ PBXProjectModuleGUID 1CD052900623707200166675 - history - - 1BFAB30407AF78F800C841BA - - prevStack - - 1BFAB30607AF78F800C841BA - SplitCount 1 @@ -538,8 +520,8 @@ TableOfContents - 1B82411E07BD690200279D6D - 1B82411F07BD690200279D6D + 1B82478107BF8A4C00279D6D + 1B82478207BF8A4C00279D6D 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -548,7 +530,7 @@ WindowString 661 163 589 501 0 0 1440 878 WindowToolGUID - 1B82411E07BD690200279D6D + 1B82478107BF8A4C00279D6D WindowToolIsVisible @@ -848,8 +830,8 @@ yes sizes - {{0, 0}, {491, 167}} - {{0, 176}, {491, 267}} + {{0, 0}, {493, 167}} + {{0, 176}, {493, 267}} VerticalSplitView @@ -898,9 +880,9 @@ TableOfContents 1C0AD2B3069F1EA900FABCE6 - 1B82412007BD690200279D6D + 1B82478307BF8A4C00279D6D 1CD0528B0623707200166675 - 1B82412107BD690200279D6D + 1B82478407BF8A4C00279D6D ToolbarConfiguration xcode.toolbar.config.run diff --git a/LeanCalc.xcode/liyanage.pbxuser b/LeanCalc.xcode/liyanage.pbxuser index 24f3141..b916e49 100644 --- a/LeanCalc.xcode/liyanage.pbxuser +++ b/LeanCalc.xcode/liyanage.pbxuser @@ -53,10 +53,6 @@ fRef = 2A37F4B7FDCFA73011CA2CEA; isa = PBXBookmark; }; - 1B82418507BE13B000279D6D = { - fRef = 2A37F4B7FDCFA73011CA2CEA; - isa = PBXBookmark; - }; 1B82427B07BF61C600279D6D = { fRef = 089C1660FE840EACC02AAC07; isa = PBXTextBookmark; @@ -67,16 +63,6 @@ vrLen = 124; vrLoc = 0; }; - 1B82427E07BF61C600279D6D = { - fRef = 8D15AC360486D014006FF6A4; - isa = PBXTextBookmark; - name = "Info.plist: 48"; - rLen = 0; - rLoc = 1273; - rType = 0; - vrLen = 878; - vrLoc = 382; - }; 1B82427F07BF61C600279D6D = { fRef = 089C1660FE840EACC02AAC07; isa = PBXTextBookmark; @@ -87,26 +73,6 @@ vrLen = 124; vrLoc = 0; }; - 1B82429107BF677B00279D6D = { - fRef = 2A37F4BAFDCFA73011CA2CEA; - isa = PBXTextBookmark; - name = "English: 2"; - rLen = 0; - rLoc = 1; - rType = 0; - vrLen = 163; - vrLoc = 0; - }; - 1B8242D207BF6C9D00279D6D = { - fRef = 8D15AC360486D014006FF6A4; - isa = PBXTextBookmark; - name = "Info.plist: 25"; - rLen = 0; - rLoc = 688; - rType = 0; - vrLen = 949; - vrLoc = 0; - }; 1B82434A07BF7A4B00279D6D = { fRef = 8D15AC360486D014006FF6A4; isa = PBXTextBookmark; @@ -117,25 +83,6 @@ vrLen = 949; vrLoc = 0; }; - 1B82434F07BF7A4B00279D6D = { - fRef = 8D15AC360486D014006FF6A4; - isa = PBXTextBookmark; - name = "Info.plist: 45"; - rLen = 0; - rLoc = 1246; - rType = 0; - vrLen = 949; - vrLoc = 0; - }; - 1B8243AF07BF85FE00279D6D = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - name = main.m; - path = /Users/liyanage/Desktop/LeanCalc/src/main.m; - refType = 0; - sourceTree = ""; - }; 1B8243C007BF863D00279D6D = { fRef = 2A37F4BAFDCFA73011CA2CEA; isa = PBXTextBookmark; @@ -146,24 +93,10 @@ vrLen = 163; vrLoc = 0; }; - 1B8243C207BF863D00279D6D = { - fRef = 2A37F4BAFDCFA73011CA2CEA; - isa = PBXTextBookmark; - name = "English: 2"; - rLen = 0; - rLoc = 1; - rType = 0; - vrLen = 163; - vrLoc = 0; - }; 1B8243C407BF865300279D6D = { fRef = 1B8243BC07BF863600279D6D; isa = PBXBookmark; }; - 1B8243C507BF865300279D6D = { - fRef = 1B8243AF07BF85FE00279D6D; - isa = PBXBookmark; - }; 1B8243C607BF865300279D6D = { fRef = 1B8243BC07BF863600279D6D; isa = PBXBookmark; @@ -202,14 +135,14 @@ vrLen = 347; vrLoc = 0; }; - 1B8243E507BF86C300279D6D = { + 1B82478707BF8A7000279D6D = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {650, 465}}"; - sepNavSelRange = "{147, 0}"; + sepNavSelRange = "{132, 0}"; sepNavVisRect = "{{0, 0}, {650, 465}}"; }; }; - 1B8243E707BF86C900279D6D = { + 1B82478907BF8A7600279D6D = { fRef = 1B8243C807BF866200279D6D; isa = PBXTextBookmark; name = "main.m: 1"; @@ -219,17 +152,17 @@ vrLen = 306; vrLoc = 0; }; - 1B8243E807BF86C900279D6D = { - fRef = 1B8243E507BF86C300279D6D; + 1B82478A07BF8A7600279D6D = { + fRef = 1B82478707BF8A7000279D6D; isa = PBXTextBookmark; - name = "LeanCalc_Prefix.pch: 8"; + name = "LeanCalc_Prefix.pch: 1"; rLen = 0; - rLoc = 147; + rLoc = 0; rType = 0; vrLen = 147; vrLoc = 0; }; - 1B8243E907BF86C900279D6D = { + 1B82478B07BF8A7600279D6D = { fRef = 1B8243C807BF866200279D6D; isa = PBXTextBookmark; name = "main.m: 1"; @@ -239,12 +172,12 @@ vrLen = 306; vrLoc = 0; }; - 1B8243EF07BF879700279D6D = { - fRef = 1B8243E507BF86C300279D6D; + 1B82478C07BF8A7600279D6D = { + fRef = 1B82478707BF8A7000279D6D; isa = PBXTextBookmark; - name = "LeanCalc_Prefix.pch: 8"; + name = "LeanCalc_Prefix.pch: 6"; rLen = 0; - rLoc = 147; + rLoc = 132; rType = 0; vrLen = 147; vrLoc = 0; @@ -263,42 +196,6 @@ vrLen = 949; vrLoc = 0; }; - 1BC8F72507B97E7C00987A06 = { - fRef = 1BC8F72607B97E7C00987A06; - isa = PBXTextBookmark; - name = "(null): 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 912; - vrLoc = 0; - }; - 1BC8F72607B97E7C00987A06 = { - isa = PBXFileReference; - lastKnownFileType = text; - name = abs; - path = /Users/liyanage/Desktop/LeanCalc/help/abs; - refType = 0; - sourceTree = ""; - }; - 1BC8F72C07B97E7C00987A06 = { - fRef = 1BC8F72D07B97E7C00987A06; - isa = PBXTextBookmark; - name = "(null): 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 912; - vrLoc = 0; - }; - 1BC8F72D07B97E7C00987A06 = { - isa = PBXFileReference; - lastKnownFileType = text; - name = abs; - path = /Users/liyanage/Desktop/LeanCalc/help/abs; - refType = 0; - sourceTree = ""; - }; 1BD2F3F207B74F230022B69D = { fRef = 2A37F4B5FDCFA73011CA2CEA; isa = PBXBookmark; @@ -307,18 +204,6 @@ fRef = 2A37F4B5FDCFA73011CA2CEA; isa = PBXBookmark; }; - 1BD2F44B07B828E30022B69D = { - isa = PBXFileReference; - lastKnownFileType = file; - name = LeanCalc.icns; - path = /Users/liyanage/Desktop/LeanCalc/LeanCalc.icns; - refType = 0; - sourceTree = ""; - }; - 1BD2F45007B829610022B69D = { - fRef = 1BD2F44B07B828E30022B69D; - isa = PBXBookmark; - }; 1BD2F45307B829610022B69D = { fRef = 2A37F4BAFDCFA73011CA2CEA; isa = PBXTextBookmark; @@ -329,38 +214,6 @@ vrLen = 157; vrLoc = 0; }; - 1BD2F45407B829610022B69D = { - fRef = 1BD2F44B07B828E30022B69D; - isa = PBXBookmark; - }; - 1BFAB24607AEDC1800C841BA = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = zmath.h; - path = /Users/liyanage/Desktop/LeanCalc/Calc/calc/zmath.h; - refType = 0; - sourceTree = ""; - }; - 1BFAB30407AF78F800C841BA = { - fRef = 1BFAB24607AEDC1800C841BA; - isa = PBXTextBookmark; - name = "//typedef SB32 BOOL;\t\t\t/* TRUE or FALSE value */\n"; - rLen = 49; - rLoc = 5600; - rType = 0; - vrLen = 592; - vrLoc = 5342; - }; - 1BFAB30607AF78F800C841BA = { - fRef = 1BFAB24607AEDC1800C841BA; - isa = PBXTextBookmark; - name = "//typedef SB32 BOOL;\t\t\t/* TRUE or FALSE value */\n"; - rLen = 49; - rLoc = 5600; - rType = 0; - vrLen = 592; - vrLoc = 5342; - }; 2A37F4A9FDCFA73011CA2CEA = { activeBuildStyle = 4A9504D1FFE6A4CB11CA0CBA; activeExecutable = 1B30E57307AEA98F00363386; @@ -419,7 +272,7 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 129853534; + PBXPerProjectTemplateStateSaveDate = 129993072; PBXPrepackagedSmartGroups_v2 = ( { PBXTransientLocationAtTop = bottom; @@ -596,40 +449,27 @@ }; }, ); - PBXWorkspaceStateSaveDate = 129853534; + PBXWorkspaceStateSaveDate = 129993072; }; perUserProjectItems = { 1B82418207BE13B000279D6D = 1B82418207BE13B000279D6D; - 1B82418507BE13B000279D6D = 1B82418507BE13B000279D6D; 1B82427B07BF61C600279D6D = 1B82427B07BF61C600279D6D; - 1B82427E07BF61C600279D6D = 1B82427E07BF61C600279D6D; 1B82427F07BF61C600279D6D = 1B82427F07BF61C600279D6D; - 1B82429107BF677B00279D6D = 1B82429107BF677B00279D6D; - 1B8242D207BF6C9D00279D6D = 1B8242D207BF6C9D00279D6D; 1B82434A07BF7A4B00279D6D = 1B82434A07BF7A4B00279D6D; - 1B82434F07BF7A4B00279D6D = 1B82434F07BF7A4B00279D6D; 1B8243C007BF863D00279D6D = 1B8243C007BF863D00279D6D; - 1B8243C207BF863D00279D6D = 1B8243C207BF863D00279D6D; 1B8243C407BF865300279D6D = 1B8243C407BF865300279D6D; - 1B8243C507BF865300279D6D = 1B8243C507BF865300279D6D; 1B8243C607BF865300279D6D = 1B8243C607BF865300279D6D; 1B8243E107BF86BE00279D6D = 1B8243E107BF86BE00279D6D; 1B8243E307BF86BE00279D6D = 1B8243E307BF86BE00279D6D; - 1B8243E707BF86C900279D6D = 1B8243E707BF86C900279D6D; - 1B8243E807BF86C900279D6D = 1B8243E807BF86C900279D6D; - 1B8243E907BF86C900279D6D = 1B8243E907BF86C900279D6D; - 1B8243EF07BF879700279D6D = 1B8243EF07BF879700279D6D; + 1B82478907BF8A7600279D6D = 1B82478907BF8A7600279D6D; + 1B82478A07BF8A7600279D6D = 1B82478A07BF8A7600279D6D; + 1B82478B07BF8A7600279D6D = 1B82478B07BF8A7600279D6D; + 1B82478C07BF8A7600279D6D = 1B82478C07BF8A7600279D6D; 1BADE91E07BC0E6C0020BE61 = 1BADE91E07BC0E6C0020BE61; 1BC8F14907B8301200987A06 = 1BC8F14907B8301200987A06; - 1BC8F72507B97E7C00987A06 = 1BC8F72507B97E7C00987A06; - 1BC8F72C07B97E7C00987A06 = 1BC8F72C07B97E7C00987A06; 1BD2F3F207B74F230022B69D = 1BD2F3F207B74F230022B69D; 1BD2F3F507B74F230022B69D = 1BD2F3F507B74F230022B69D; - 1BD2F45007B829610022B69D = 1BD2F45007B829610022B69D; 1BD2F45307B829610022B69D = 1BD2F45307B829610022B69D; - 1BD2F45407B829610022B69D = 1BD2F45407B829610022B69D; - 1BFAB30407AF78F800C841BA = 1BFAB30407AF78F800C841BA; - 1BFAB30607AF78F800C841BA = 1BFAB30607AF78F800C841BA; }; sourceControlManager = 1B30E57E07AEA99900363386; userBuildSettings = { diff --git a/LeanCalc.xcode/project.pbxproj b/LeanCalc.xcode/project.pbxproj index 81f5333..7f6f4f1 100644 --- a/LeanCalc.xcode/project.pbxproj +++ b/LeanCalc.xcode/project.pbxproj @@ -254,7 +254,20 @@ settings = { }; }; - 1B8243E507BF86C300279D6D = { + 1B82477B07BF8A3100279D6D = { + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + isa = PBXShellScriptBuildPhase; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "ranlib calc/*.a"; + }; + 1B82478707BF8A7000279D6D = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -262,8 +275,8 @@ refType = 4; sourceTree = ""; }; - 1B8243E607BF86C300279D6D = { - fileRef = 1B8243E507BF86C300279D6D; + 1B82478807BF8A7000279D6D = { + fileRef = 1B82478707BF8A7000279D6D; isa = PBXBuildFile; settings = { }; @@ -377,8 +390,8 @@ }; 2A37F4AFFDCFA73011CA2CEA = { children = ( - 1B8243E507BF86C300279D6D, 1B8243C807BF866200279D6D, + 1B82478707BF8A7000279D6D, ); isa = PBXGroup; name = "Other Sources"; @@ -529,6 +542,7 @@ //8D4 8D15AC270486D014006FF6A4 = { buildPhases = ( + 1B82477B07BF8A3100279D6D, 8D15AC2B0486D014006FF6A4, 8D15AC300486D014006FF6A4, 8D15AC330486D014006FF6A4, @@ -542,7 +556,7 @@ GCC_PREFIX_HEADER = LeanCalc_Prefix.pch; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = "/Users/liyanage/Desktop/LeanCalc /Users/liyanage/Desktop/LeanCalc/Calc"; + LIBRARY_SEARCH_PATHS = calc; PRODUCT_NAME = LeanCalc; WRAPPER_EXTENSION = app; }; @@ -568,7 +582,7 @@ 1B8243D707BF867300279D6D, 1B8243D907BF867300279D6D, 1B8243DB07BF867300279D6D, - 1B8243E607BF86C300279D6D, + 1B82478807BF8A7000279D6D, ); isa = PBXResourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; diff --git a/calc/libcalc.a b/calc/libcalc.a index 16dbd32..c7b494e 100644 Binary files a/calc/libcalc.a and b/calc/libcalc.a differ diff --git a/calc/libcustcalc.a b/calc/libcustcalc.a index 6f7b465..a19ef55 100644 Binary files a/calc/libcustcalc.a and b/calc/libcustcalc.a differ