Update yet again.

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

diff --git a/freeswitch.xcodeproj/brian.mode1 b/freeswitch.xcodeproj/brian.mode1
index fc8ccc808e797c1a04b40429870384f873bd8664..a0aa796cc4b227cb159eca4cd1a6edfdb98ef30f 100644 (file)
--- a/freeswitch.xcodeproj/brian.mode1
+++ b/freeswitch.xcodeproj/brian.mode1
@@ -261,20 +261,7 @@
                                                        <array>
                                                                <string>D3A7637E09BEAAEE002E9B53</string>
                                                                <string>1C37FBAC04509CD000000102</string>
-                                                               <string>D3C7A92609BF6921009127A4</string>
-                                                               <string>D3C7A92709BF6921009127A4</string>
-                                                               <string>D3C7A92809BF6921009127A4</string>
-                                                               <string>D3C7A92909BF6921009127A4</string>
-                                                               <string>D3C7A92A09BF6921009127A4</string>
-                                                               <string>D3C7A92B09BF6921009127A4</string>
-                                                               <string>D3C7A92C09BF6921009127A4</string>
-                                                               <string>D3C7A92D09BF6921009127A4</string>
-                                                               <string>D3C7A92E09BF6921009127A4</string>
-                                                               <string>D3C7A92F09BF6921009127A4</string>
-                                                               <string>D3C7A93009BF6921009127A4</string>
-                                                               <string>D3C7A93109BF6921009127A4</string>
-                                                               <string>1C08E77C0454961000C914BD</string>
-                                                               <string>E2644B35053B69B200211256</string>
+                                                               <string>D3C7A96609BF6AA5009127A4</string>
                                                        </array>
                                                        <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
                                                        <array>
@@ -283,7 +270,7 @@
                                                                </array>
                                                        </array>
                                                        <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-                                                       <string>{{0, 353}, {368, 812}}</string>
+                                                       <string>{{0, 0}, {368, 812}}</string>
                                                </dict>
                                                <key>PBXTopSmartGroupGIDs</key>
                                                <array/>
@@ -383,9 +370,9 @@
                        </array>
                        <key>TableOfContents</key>
                        <array>
-                               <string>D3C7A70909BF3F9F009127A4</string>
+                               <string>D3C7A95109BF69FC009127A4</string>
                                <string>1CE0B1FE06471DED0097A5F4</string>
-                               <string>D3C7A70A09BF3F9F009127A4</string>
+                               <string>D3C7A95209BF69FC009127A4</string>
                                <string>1CE0B20306471E060097A5F4</string>
                                <string>1CE0B20506471E060097A5F4</string>
                        </array>
@@ -519,12 +506,6 @@
        <integer>5</integer>
        <key>WindowOrderList</key>
        <array>
-               <string>D3C7A7F609BF58E5009127A4</string>
-               <string>D3C7A76B09BF4B13009127A4</string>
-               <string>D3C7A76C09BF4B13009127A4</string>
-               <string>D3C7A76709BF4AFE009127A4</string>
-               <string>1CD10A99069EF8BA00B06720</string>
-               <string>D3C7A76609BF4AFE009127A4</string>
                <string>1C0AD2B3069F1EA900FABCE6</string>
                <string>D3A763A109BEAC72002E9B53</string>
                <string>/Users/brian/freeswitch/freeswitch.xcodeproj</string>
@@ -568,8 +549,6 @@
                                                        <string>88pt</string>
                                                </dict>
                                                <dict>
-                                                       <key>BecomeActive</key>
-                                                       <true/>
                                                        <key>ContentConfiguration</key>
                                                        <dict>
                                                                <key>PBXBuildLogShowsTranscriptDefaultKey</key>
@@ -611,7 +590,7 @@
                        <key>TableOfContents</key>
                        <array>
                                <string>D3A763A109BEAC72002E9B53</string>
-                               <string>D3C7A70B09BF3F9F009127A4</string>
+                               <string>D3C7A95309BF69FC009127A4</string>
                                <string>1CD0528F0623707200166675</string>
                                <string>XCMainBuildResultsModuleGUID</string>
                        </array>
@@ -622,7 +601,7 @@
                        <key>WindowToolGUID</key>
                        <string>D3A763A109BEAC72002E9B53</string>
                        <key>WindowToolIsVisible</key>
-                       <true/>
+                       <false/>
                </dict>
                <dict>
                        <key>FirstTimeWindowDisplayed</key>
@@ -931,8 +910,8 @@
                                                                                <string>yes</string>
                                                                                <key>sizes</key>
                                                                                <array>
-                                                                                       <string>{{0, 0}, {493, 168}}</string>
-                                                                                       <string>{{0, 173}, {493, 270}}</string>
+                                                                                       <string>{{0, 0}, {491, 168}}</string>
+                                                                                       <string>{{0, 173}, {491, 270}}</string>
                                                                                </array>
                                                                        </dict>
                                                                        <key>VerticalSplitView</key>
@@ -981,9 +960,9 @@
                        <key>TableOfContents</key>
                        <array>
                                <string>1C0AD2B3069F1EA900FABCE6</string>
-                               <string>D3C7A70C09BF3F9F009127A4</string>
+                               <string>D3C7A95409BF69FC009127A4</string>
                                <string>1CD0528B0623707200166675</string>
-                               <string>D3C7A70D09BF3F9F009127A4</string>
+                               <string>D3C7A95509BF69FC009127A4</string>
                        </array>
                        <key>ToolbarConfiguration</key>
                        <string>xcode.toolbar.config.run</string>

diff --git a/freeswitch.xcodeproj/brian.pbxuser b/freeswitch.xcodeproj/brian.pbxuser
index 4792ea15c996bda67c0e1e9d1d680b13fb0cb278..61b631558563fa2efb6fc8cdd9857c8005efa476 100644 (file)
--- a/freeswitch.xcodeproj/brian.pbxuser
+++ b/freeswitch.xcodeproj/brian.pbxuser
@@ -96,7 +96,7 @@
                activeBuildConfigurationName = Debug;
                activeBuildStyle = D31D4A3209BEBE12001112B8 /* Development */;
                activeExecutable = D31D509109BECBA3001112B8 /* freeswitch */;
-               activeTarget = D346F17909BF38AE00404918 /* mod_echo.dylib */;
+               activeTarget = D3A763FE09BEB271002E9B53 /* All */;
                addToTargets = (
                );
                breakpoints = (
@@ -253,8 +253,8 @@
                                        PBXFileDataSource_Warnings_ColumnID,
                                );
                        };
-                       PBXPerProjectTemplateStateSaveDate = 163528575;
-                       PBXWorkspaceStateSaveDate = 163528575;
+                       PBXPerProjectTemplateStateSaveDate = 163539282;
+                       PBXWorkspaceStateSaveDate = 163539282;
                };
                sourceControlManager = D3A7638409BEAAEE002E9B53 /* Source Control */;
                userBuildSettings = {

diff --git a/freeswitch.xcodeproj/project.pbxproj b/freeswitch.xcodeproj/project.pbxproj
index aa15c5b42a964e692ec00fb7156660de754fd411..55467f4accbd3321ac7d6de0421564d79df96268 100644 (file)
--- a/freeswitch.xcodeproj/project.pbxproj
+++ b/freeswitch.xcodeproj/project.pbxproj
@@ -224,6 +224,13 @@
                        remoteGlobalIDString = D3C7A86109BF60A1009127A4 /* teletone */;
                        remoteInfo = teletone;
                };
+               D3C7A95809BF6A15009127A4 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = D3A7638009BEAAEE002E9B53 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = D31D504109BECA92001112B8 /* libfreeswitch.dylib */;
+                       remoteInfo = libfreeswitch.dylib;
+               };
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -533,6 +540,7 @@
                                ZERO_LINK = YES;
                        };
                        dependencies = (
+                               D3C7A95909BF6A15009127A4 /* PBXTargetDependency */,
                        );
                        name = freeswitch;
                        productName = freeswitch;
@@ -611,15 +619,15 @@
                        projectDirPath = "";
                        targets = (
                                D3A763FE09BEB271002E9B53 /* All */,
-                               D31D504109BECA92001112B8 /* libfreeswitch.dylib */,
-                               D31D508F09BECBA3001112B8 /* freeswitch */,
-                               D346F17909BF38AE00404918 /* mod_echo.dylib */,
-                               D3C7A72209BF467F009127A4 /* mod_bridgecall.dylib */,
                                D3C7A7EC09BF58D2009127A4 /* apr-1.2.2 */,
                                D3C7A80209BF5B43009127A4 /* sqlite-3.2.8 */,
                                D3C7A84009BF5FC2009127A4 /* apr-util-1.2.2 */,
                                D3C7A85C09BF6066009127A4 /* resample-0.1.3 */,
                                D3C7A86109BF60A1009127A4 /* teletone */,
+                               D31D504109BECA92001112B8 /* libfreeswitch.dylib */,
+                               D31D508F09BECBA3001112B8 /* freeswitch */,
+                               D346F17909BF38AE00404918 /* mod_echo.dylib */,
+                               D3C7A72209BF467F009127A4 /* mod_bridgecall.dylib */,
                        );
                };
 /* End PBXProject section */
@@ -823,6 +831,11 @@
                        target = D3C7A86109BF60A1009127A4 /* teletone */;
                        targetProxy = D3C7A87309BF60F2009127A4 /* PBXContainerItemProxy */;
                };
+               D3C7A95909BF6A15009127A4 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D31D504109BECA92001112B8 /* libfreeswitch.dylib */;
+                       targetProxy = D3C7A95809BF6A15009127A4 /* PBXContainerItemProxy */;
+               };
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
@@ -1032,7 +1045,25 @@
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-                               INSTALL_PATH = /usr/local/lib;
+                               HEADER_SEARCH_PATHS = "$(INSTALL_PATH)/../lib";
+                               INSTALL_PATH = /usr/local/freeswitch/lib;
+                               OTHER_CFLAGS = (
+                                       "-DHAVE_CONFIG_H",
+                                       "-I.",
+                                       "-I./src/include",
+                                       "-I$(INSTALL_PATH)/../include",
+                                       "-g",
+                                       "-O2",
+                                       "-DMACOSX",
+                                       "-DSIGPROCMASK_SETS_THREAD_MASK",
+                                       "-no-cpp-precomp",
+                                       "-I$(INSTALL_PATH)/../include/apr-1",
+                               );
+                               OTHER_LDFLAGS = (
+                                       "-lapr-1",
+                                       "-lexpat",
+                                       "-liconv",
+                               );
                                PREBINDING = NO;
                                PRODUCT_NAME = mod_bridgecall;
                                ZERO_LINK = YES;