Update these a tiny bit.

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

diff --git a/mac/xcode/freeswitch.xcodeproj/project.pbxproj b/mac/xcode/freeswitch.xcodeproj/project.pbxproj
index 582841dc5ff076884054a64287333b4c8337da7a..311d967f9c931e7caeae563fc445a37de950dbd5 100644 (file)
--- a/mac/xcode/freeswitch.xcodeproj/project.pbxproj
+++ b/mac/xcode/freeswitch.xcodeproj/project.pbxproj
@@ -38,6 +38,7 @@
                D35430C409C37820000A33C3 /* freeswitch.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = freeswitch.framework; path = /Library/Frameworks/freeswitch.framework; sourceTree = "<absolute>"; };
                D35430C509C37820000A33C3 /* sqlite.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = sqlite.framework; path = /Library/Frameworks/sqlite.framework; sourceTree = "<absolute>"; };
                D35430C609C37820000A33C3 /* teletone.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = teletone.framework; path = /Library/Frameworks/teletone.framework; sourceTree = "<absolute>"; };
+               D3814F8D09CFA28200553C1B /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../../src/include/config.h; sourceTree = SOURCE_ROOT; };
                D3EA84A109C127DC006A903B /* freeswitch */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = freeswitch; sourceTree = BUILT_PRODUCTS_DIR; };
                D3EA84AA09C12851006A903B /* switch.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = switch.c; path = ../../src/switch.c; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
@@ -74,6 +75,7 @@
                D3EA84A209C127DC006A903B /* freeswitch */ = {
                        isa = PBXGroup;
                        children = (
+                               D3814F8D09CFA28200553C1B /* config.h */,
                                D3EA84AA09C12851006A903B /* switch.c */,
                        );
                        name = freeswitch;

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 7f80adeedd367028bc3a281107987cc70995995b..c078dd60d039964cd04dfc23a8811a214eab361d 100644 (file)
--- a/mac/xcode/libs/apr-1.2.2.xcodeproj/project.pbxproj
+++ b/mac/xcode/libs/apr-1.2.2.xcodeproj/project.pbxproj
@@ -113,20 +113,6 @@
                D3542E4E09C36DE7000A33C3 /* apr_version.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C917409C10E6D00FCE413 /* apr_version.h */; settings = {ATTRIBUTES = (Public, ); }; };
                D3542E4F09C36DE7000A33C3 /* apr_want.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C917509C10E6D00FCE413 /* apr_want.h */; settings = {ATTRIBUTES = (Public, ); }; };
                D3542E5009C36DE7000A33C3 /* apr_private_common.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C917909C10E6D00FCE413 /* apr_private_common.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               D3542E5109C36DE7000A33C3 /* apr_arch_dso.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C919B09C10E6D00FCE413 /* apr_arch_dso.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               D3542E5209C36DE7000A33C3 /* apr_arch_file_io.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C919C09C10E6D00FCE413 /* apr_arch_file_io.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               D3542E5309C36DE7000A33C3 /* apr_arch_global_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C919D09C10E6D00FCE413 /* apr_arch_global_mutex.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               D3542E5409C36DE7000A33C3 /* apr_arch_inherit.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C919E09C10E6D00FCE413 /* apr_arch_inherit.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               D3542E5509C36DE7000A33C3 /* apr_arch_internal_time.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C919F09C10E6D00FCE413 /* apr_arch_internal_time.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               D3542E5609C36DE7000A33C3 /* apr_arch_misc.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C91A009C10E6D00FCE413 /* apr_arch_misc.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               D3542E5709C36DE7000A33C3 /* apr_arch_networkio.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C91A109C10E6D00FCE413 /* apr_arch_networkio.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               D3542E5809C36DE7000A33C3 /* apr_arch_poll_private.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C91A209C10E6D00FCE413 /* apr_arch_poll_private.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               D3542E5909C36DE7000A33C3 /* apr_arch_proc_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C91A309C10E6D00FCE413 /* apr_arch_proc_mutex.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               D3542E5A09C36DE7000A33C3 /* apr_arch_shm.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C91A409C10E6D00FCE413 /* apr_arch_shm.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               D3542E5B09C36DE7000A33C3 /* apr_arch_thread_cond.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C91A509C10E6D00FCE413 /* apr_arch_thread_cond.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               D3542E5C09C36DE7000A33C3 /* apr_arch_thread_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C91A609C10E6D00FCE413 /* apr_arch_thread_mutex.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               D3542E5D09C36DE7000A33C3 /* apr_arch_thread_rwlock.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C91A709C10E6D00FCE413 /* apr_arch_thread_rwlock.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               D3542E5E09C36DE7000A33C3 /* apr_arch_threadproc.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C91A809C10E6D00FCE413 /* apr_arch_threadproc.h */; settings = {ATTRIBUTES = (Public, ); }; };
                D3542E5F09C36DE7000A33C3 /* apr_private.h in Headers */ = {isa = PBXBuildFile; fileRef = D32C91A909C10E6D00FCE413 /* apr_private.h */; settings = {ATTRIBUTES = (Public, ); }; };
 /* End PBXBuildFile section */
 
@@ -772,20 +758,6 @@
                                D3542E4E09C36DE7000A33C3 /* apr_version.h in Headers */,
                                D3542E4F09C36DE7000A33C3 /* apr_want.h in Headers */,
                                D3542E5009C36DE7000A33C3 /* apr_private_common.h in Headers */,
-                               D3542E5109C36DE7000A33C3 /* apr_arch_dso.h in Headers */,
-                               D3542E5209C36DE7000A33C3 /* apr_arch_file_io.h in Headers */,
-                               D3542E5309C36DE7000A33C3 /* apr_arch_global_mutex.h in Headers */,
-                               D3542E5409C36DE7000A33C3 /* apr_arch_inherit.h in Headers */,
-                               D3542E5509C36DE7000A33C3 /* apr_arch_internal_time.h in Headers */,
-                               D3542E5609C36DE7000A33C3 /* apr_arch_misc.h in Headers */,
-                               D3542E5709C36DE7000A33C3 /* apr_arch_networkio.h in Headers */,
-                               D3542E5809C36DE7000A33C3 /* apr_arch_poll_private.h in Headers */,
-                               D3542E5909C36DE7000A33C3 /* apr_arch_proc_mutex.h in Headers */,
-                               D3542E5A09C36DE7000A33C3 /* apr_arch_shm.h in Headers */,
-                               D3542E5B09C36DE7000A33C3 /* apr_arch_thread_cond.h in Headers */,
-                               D3542E5C09C36DE7000A33C3 /* apr_arch_thread_mutex.h in Headers */,
-                               D3542E5D09C36DE7000A33C3 /* apr_arch_thread_rwlock.h in Headers */,
-                               D3542E5E09C36DE7000A33C3 /* apr_arch_threadproc.h in Headers */,
                                D3542E5F09C36DE7000A33C3 /* apr_private.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
@@ -886,7 +858,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/bash;
-                       shellScript = "if [ -e ../../../libs/apr-1.2.2/.complete ]; then\n\texit 0\nfi\n/usr/bin/curl http://svn.freeswitch.org/downloads/libs/apr-1.2.2.tar.gz -o ../../../libs/apr-1.2.2.tar.gz\ncd ../../../libs\ntar zxfv apr-1.2.2.tar.gz\ncd apr-1.2.2\n./configure\nmake apr.exp\ntouch .complete";
+                       shellScript = "if [ -e ../../../libs/apr-1.2.2/.complete ]; then\n\texit 0\nfi\n/usr/bin/curl http://svn.freeswitch.org/downloads/libs/apr-1.2.2.tar.gz -o ../../../libs/apr-1.2.2.tar.gz\ncd ../../../libs\ntar zxfv apr-1.2.2.tar.gz\ncd apr-1.2.2\n./configure --enable-layout=\"Mac OS X Server\"\nmake apr.exp\ntouch .complete";
                };
 /* End PBXShellScriptBuildPhase section */
 
@@ -1027,9 +999,9 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
                                DSTROOT = /;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               FRAMEWORK_VERSION = A;
+                               DYLIB_COMPATIBILITY_VERSION = 3.2.0;
+                               DYLIB_CURRENT_VERSION = 3.0.0;
+                               FRAMEWORK_VERSION = 2.0;
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = G5;

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 31df1e559db6e4dd2cb8adffa76288fd6bba2302..2e4bc955e2a1a0764feb932572c7472878238f59 100644 (file)
--- a/mac/xcode/libs/aprutil-1.2.2.xcodeproj/project.pbxproj
+++ b/mac/xcode/libs/aprutil-1.2.2.xcodeproj/project.pbxproj
@@ -492,7 +492,7 @@
                        isa = PBXNativeTarget;
                        buildConfigurationList = D3F01FE609C1182800120915 /* Build configuration list for PBXNativeTarget "aprutil.framework" */;
                        buildPhases = (
-                               D3F01FEF09C1186300120915 /* ShellScript */,
+                               D3F01FEF09C1186300120915 /* Prepare Source */,
                                D3F01FDE09C1182700120915 /* Headers */,
                                D3F01FDF09C1182700120915 /* Resources */,
                                D3F01FE009C1182700120915 /* Sources */,
@@ -574,13 +574,14 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-               D3F01FEF09C1186300120915 /* ShellScript */ = {
+               D3F01FEF09C1186300120915 /* Prepare Source */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        inputPaths = (
                        );
+                       name = "Prepare Source";
                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
@@ -719,10 +720,7 @@
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = G5;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               HEADER_SEARCH_PATHS = (
-                                       "../../../../libs/apr-1.2.2",
-                                       "../../../libs/apr-1.2.2/include",
-                               );
+                               HEADER_SEARCH_PATHS = /Library/Frameworks/apr.framework/Headers;
                                INFOPLIST_FILE = "aprutil-Info.plist";
                                INSTALL_PATH = /Library/Frameworks;
                                OTHER_LDFLAGS = (

diff --git a/mac/xcode/libs/libfreeswitch.xcodeproj/project.pbxproj b/mac/xcode/libs/libfreeswitch.xcodeproj/project.pbxproj
index 64d5359e9a1c6fbfafafcb31aa8f3136ded38731..5f89b36b3a3c3bc103040b0df410a533d9866995 100644 (file)
--- a/mac/xcode/libs/libfreeswitch.xcodeproj/project.pbxproj
+++ b/mac/xcode/libs/libfreeswitch.xcodeproj/project.pbxproj
@@ -389,14 +389,6 @@
                                        "$(SRCROOT)/build/resample",
                                );
                                OTHER_CFLAGS = (
-                                       "-framework",
-                                       apr,
-                                       "-framework",
-                                       aprutil,
-                                       "-framework",
-                                       sqlite,
-                                       "-lpthread",
-                                       "-liconv",
                                        "-DMACOSX",
                                        "-DSWITCH_MOD_DIR=\"$(FREESWITCH_PATH)/mod\"",
                                        "-DSWITCH_PREFIX_DIR=\"$(FREESWITCH_PATH)\"",