more updates

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@826 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/mac/xcode/libs/apr-1.2.2.xcodeproj/brian.mode1 b/mac/xcode/libs/apr-1.2.2.xcodeproj/brian.mode1
index ed9b0356eb515dbda5aefeb7ec631c2809eb162f..674a5c7e9eea23e16b328eb5e623745a048244f5 100644 (file)
--- a/mac/xcode/libs/apr-1.2.2.xcodeproj/brian.mode1
+++ b/mac/xcode/libs/apr-1.2.2.xcodeproj/brian.mode1
@@ -222,8 +222,6 @@
                        <key>Layout</key>
                        <array>
                                <dict>
-                                       <key>BecomeActive</key>
-                                       <true/>
                                        <key>ContentConfiguration</key>
                                        <dict>
                                                <key>PBXBottomSmartGroupGIDs</key>
@@ -261,15 +259,13 @@
                                                        <array>
                                                                <string>D32C90D609C10C3300FCE413</string>
                                                                <string>1C37FBAC04509CD000000102</string>
-                                                               <string>D3F01FF409C1186B00120915</string>
+                                                               <string>D3F0215409C11DC500120915</string>
                                                                <string>1C37FABC05509CD000000102</string>
                                                        </array>
                                                        <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
                                                        <array>
                                                                <array>
-                                                                       <integer>6</integer>
-                                                                       <integer>5</integer>
-                                                                       <integer>4</integer>
+                                                                       <integer>0</integer>
                                                                </array>
                                                        </array>
                                                        <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
@@ -337,6 +333,8 @@
                                                        <string>0pt</string>
                                                </dict>
                                                <dict>
+                                                       <key>BecomeActive</key>
+                                                       <true/>
                                                        <key>ContentConfiguration</key>
                                                        <dict>
                                                                <key>PBXProjectModuleGUID</key>
@@ -509,6 +507,7 @@
        <integer>5</integer>
        <key>WindowOrderList</key>
        <array>
+               <string>D32C90FA09C10E0E00FCE413</string>
                <string>/Users/brian/freeswitch/mac/xcode/libs/apr-1.2.2.xcodeproj</string>
        </array>
        <key>WindowString</key>
@@ -542,7 +541,7 @@
                                                                <key>Frame</key>
                                                                <string>{{0, 0}, {795, 121}}</string>
                                                                <key>RubberWindowFrame</key>
-                                                               <string>127 190 795 556 0 0 1024 746 </string>
+                                                               <string>491 472 795 556 0 0 1680 1028 </string>
                                                        </dict>
                                                        <key>Module</key>
                                                        <string>PBXNavigatorGroup</string>
@@ -555,7 +554,7 @@
                                                        <key>ContentConfiguration</key>
                                                        <dict>
                                                                <key>PBXBuildLogShowsTranscriptDefaultKey</key>
-                                                               <string>{{0, 144}, {795, 245}}</string>
+                                                               <string>{{0, 73}, {795, 316}}</string>
                                                                <key>PBXProjectModuleGUID</key>
                                                                <string>XCMainBuildResultsModuleGUID</string>
                                                                <key>PBXProjectModuleLabel</key>
@@ -570,7 +569,7 @@
                                                                <key>Frame</key>
                                                                <string>{{0, 126}, {795, 389}}</string>
                                                                <key>RubberWindowFrame</key>
-                                                               <string>127 190 795 556 0 0 1024 746 </string>
+                                                               <string>491 472 795 556 0 0 1680 1028 </string>
                                                        </dict>
                                                        <key>Module</key>
                                                        <string>PBXBuildResultsModule</string>
@@ -593,14 +592,14 @@
                        <key>TableOfContents</key>
                        <array>
                                <string>D32C90FA09C10E0E00FCE413</string>
-                               <string>D32C90FB09C10E0E00FCE413</string>
+                               <string>D3F0210309C11A5700120915</string>
                                <string>1CD0528F0623707200166675</string>
                                <string>XCMainBuildResultsModuleGUID</string>
                        </array>
                        <key>ToolbarConfiguration</key>
                        <string>xcode.toolbar.config.build</string>
                        <key>WindowString</key>
-                       <string>127 190 795 556 0 0 1024 746 </string>
+                       <string>491 472 795 556 0 0 1680 1028 </string>
                        <key>WindowToolGUID</key>
                        <string>D32C90FA09C10E0E00FCE413</string>
                        <key>WindowToolIsVisible</key>

diff --git a/mac/xcode/libs/apr-1.2.2.xcodeproj/project.pbxproj b/mac/xcode/libs/apr-1.2.2.xcodeproj/project.pbxproj
index ad4eece293a3eb5e7e5bc2052453e99bf0289874..8ed1f0b06fb314cdb34fe718891eb989f86f9b35 100644 (file)
--- a/mac/xcode/libs/apr-1.2.2.xcodeproj/project.pbxproj
+++ b/mac/xcode/libs/apr-1.2.2.xcodeproj/project.pbxproj
@@ -975,6 +975,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                NATIVE_ARCH = "ppc i386";
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                        };
                        name = Debug;
                };
@@ -983,6 +984,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
                                NATIVE_ARCH = "ppc i386";
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                        };
                        name = Release;
                };

diff --git a/mac/xcode/libs/aprutil-1.2.2.xcodeproj/brian.mode1 b/mac/xcode/libs/aprutil-1.2.2.xcodeproj/brian.mode1
index 6db8895b6d8887aa7ea2c27c1c43dec58a0e8565..6ef64442f67e104e63210e4d589881f74fcbc095 100644 (file)
--- a/mac/xcode/libs/aprutil-1.2.2.xcodeproj/brian.mode1
+++ b/mac/xcode/libs/aprutil-1.2.2.xcodeproj/brian.mode1
@@ -260,23 +260,18 @@
                                                        <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
                                                        <array>
                                                                <string>D3F01FC009C117F300120915</string>
-                                                               <string>D3F01FE409C1182700120915</string>
-                                                               <string>D3F01FFF09C1196600120915</string>
-                                                               <string>D3F0205A09C119C100120915</string>
-                                                               <string>D3F0206009C119C100120915</string>
                                                                <string>1C37FBAC04509CD000000102</string>
-                                                               <string>D3F0213D09C11C6300120915</string>
-                                                               <string>D3F0213E09C11C6300120915</string>
+                                                               <string>D3F0215309C11DBC00120915</string>
                                                                <string>1C37FABC05509CD000000102</string>
                                                        </array>
                                                        <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
                                                        <array>
                                                                <array>
-                                                                       <integer>27</integer>
+                                                                       <integer>4</integer>
                                                                </array>
                                                        </array>
                                                        <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-                                                       <string>{{0, 135}, {186, 532}}</string>
+                                                       <string>{{0, 0}, {186, 532}}</string>
                                                </dict>
                                                <key>PBXTopSmartGroupGIDs</key>
                                                <array/>

diff --git a/mac/xcode/libs/aprutil-1.2.2.xcodeproj/project.pbxproj b/mac/xcode/libs/aprutil-1.2.2.xcodeproj/project.pbxproj
index ffdc2ed7a61a0951cfda59363165a79e30d3237f..dc663a0d8b1468bbc683a8332c497c0b077f6189 100644 (file)
--- a/mac/xcode/libs/aprutil-1.2.2.xcodeproj/project.pbxproj
+++ b/mac/xcode/libs/aprutil-1.2.2.xcodeproj/project.pbxproj
@@ -84,6 +84,9 @@
                D3F0213409C11C1200120915 /* sdbm_hash.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F0206209C119C100120915 /* sdbm_hash.c */; };
                D3F0213509C11C1200120915 /* sdbm_lock.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F0206309C119C100120915 /* sdbm_lock.c */; };
                D3F0214109C11C9500120915 /* sdbm_pair.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F0214009C11C9500120915 /* sdbm_pair.c */; };
+               D3F0214809C11D5E00120915 /* sdbm_pair.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F0214509C11D5E00120915 /* sdbm_pair.h */; };
+               D3F0214909C11D5E00120915 /* sdbm_private.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F0214609C11D5E00120915 /* sdbm_private.h */; };
+               D3F0214A09C11D5E00120915 /* sdbm_tune.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F0214709C11D5E00120915 /* sdbm_tune.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXBuildStyle section */
@@ -184,6 +187,9 @@
                D3F0209E09C119C100120915 /* xlate.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = xlate.c; sourceTree = "<group>"; };
                D3F020A009C119C100120915 /* apr_xml.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = apr_xml.c; sourceTree = "<group>"; };
                D3F0214009C11C9500120915 /* sdbm_pair.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sdbm_pair.c; sourceTree = "<group>"; };
+               D3F0214509C11D5E00120915 /* sdbm_pair.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sdbm_pair.h; path = "../../../libs/apr-util-1.2.2/dbm/sdbm/sdbm_pair.h"; sourceTree = SOURCE_ROOT; };
+               D3F0214609C11D5E00120915 /* sdbm_private.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sdbm_private.h; path = "../../../libs/apr-util-1.2.2/dbm/sdbm/sdbm_private.h"; sourceTree = SOURCE_ROOT; };
+               D3F0214709C11D5E00120915 /* sdbm_tune.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sdbm_tune.h; path = "../../../libs/apr-util-1.2.2/dbm/sdbm/sdbm_tune.h"; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -237,6 +243,9 @@
                D3F0200009C1196B00120915 /* include */ = {
                        isa = PBXGroup;
                        children = (
+                               D3F0214509C11D5E00120915 /* sdbm_pair.h */,
+                               D3F0214609C11D5E00120915 /* sdbm_private.h */,
+                               D3F0214709C11D5E00120915 /* sdbm_tune.h */,
                                D3F0200109C119A200120915 /* apr_anylock.h */,
                                D3F0200209C119A200120915 /* apr_base64.h */,
                                D3F0200309C119A200120915 /* apr_buckets.h */,
@@ -462,6 +471,9 @@
                                D3F0203E09C119A200120915 /* apr_dbm_private.h in Headers */,
                                D3F0203F09C119A200120915 /* apu_config.h in Headers */,
                                D3F0204009C119A200120915 /* apu_select_dbm.h in Headers */,
+                               D3F0214809C11D5E00120915 /* sdbm_pair.h in Headers */,
+                               D3F0214909C11D5E00120915 /* sdbm_private.h in Headers */,
+                               D3F0214A09C11D5E00120915 /* sdbm_tune.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -637,6 +649,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                NATIVE_ARCH = "ppc i386";
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                        };
                        name = Debug;
                };
@@ -644,6 +657,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
+                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                        };
                        name = Release;
                };
@@ -679,7 +693,6 @@
                                        "-framework",
                                        sqlite,
                                        "-liconv",
-                                       "-lexpat",
                                        "-lpthread",
                                );
                                PREBINDING = NO;