Skip to content

F
freeswitch
提交 dabee3cf authored 作者: Brian West's avatar Brian West
浏览文件
操作

Ok frameworks link like they should (I think) 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@838 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 dae0ff0d
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 2738 行增加 和 3406 行删除
Makefile.in
浏览文件 @ dabee3cf
差异被折叠。
aclocal.m4
浏览文件 @ dabee3cf
差异被折叠。
configure
浏览文件 @ dabee3cf
差异被折叠。
mac/xcode/freeswitch.xcodeproj/project.pbxproj
浏览文件 @ dabee3cf
......@@ -7,8 +7,12 @@
objects = {
/* Begin PBXBuildFile section */
D35430C709C37820000A33C3 /* apr.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D35430C209C37820000A33C3 /* apr.framework */; };
D35430C809C37820000A33C3 /* aprutil.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D35430C309C37820000A33C3 /* aprutil.framework */; };
D35430C909C37820000A33C3 /* freeswitch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D35430C409C37820000A33C3 /* freeswitch.framework */; };
D35430CA09C37820000A33C3 /* sqlite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D35430C509C37820000A33C3 /* sqlite.framework */; };
D35430CB09C37820000A33C3 /* teletone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D35430C609C37820000A33C3 /* teletone.framework */; };
D3EA84AB09C12851006A903B /* switch.c in Sources */ = {isa = PBXBuildFile; fileRef = D3EA84AA09C12851006A903B /* switch.c */; };
D3EA84FA09C12D63006A903B /* freeswitch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3EA84D309C12AD6006A903B /* freeswitch.framework */; };
/* End PBXBuildFile section */
/* Begin PBXBuildStyle section */
......@@ -29,9 +33,13 @@
/* End PBXBuildStyle section */
/* Begin PBXFileReference section */
D35430C209C37820000A33C3 /* apr.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = apr.framework; path = /Library/Frameworks/apr.framework; sourceTree = "<absolute>"; };
D35430C309C37820000A33C3 /* aprutil.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = aprutil.framework; path = /Library/Frameworks/aprutil.framework; sourceTree = "<absolute>"; };
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>"; };
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; };
D3EA84D309C12AD6006A903B /* freeswitch.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = freeswitch.framework; path = libs/build/libfreeswitch/freeswitch.framework; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -39,7 +47,11 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D3EA84FA09C12D63006A903B /* freeswitch.framework in Frameworks */,
D35430C709C37820000A33C3 /* apr.framework in Frameworks */,
D35430C809C37820000A33C3 /* aprutil.framework in Frameworks */,
D35430C909C37820000A33C3 /* freeswitch.framework in Frameworks */,
D35430CA09C37820000A33C3 /* sqlite.framework in Frameworks */,
D35430CB09C37820000A33C3 /* teletone.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -49,9 +61,13 @@
D33CA85C09C123560087B539 = {
isa = PBXGroup;
children = (
D35430C209C37820000A33C3 /* apr.framework */,
D35430C309C37820000A33C3 /* aprutil.framework */,
D35430C409C37820000A33C3 /* freeswitch.framework */,
D35430C509C37820000A33C3 /* sqlite.framework */,
D35430C609C37820000A33C3 /* teletone.framework */,
D3EA84A209C127DC006A903B /* freeswitch */,
D3EA84A109C127DC006A903B /* freeswitch */,
D3EA84D309C12AD6006A903B /* freeswitch.framework */,
);
sourceTree = "<group>";
};
......@@ -147,11 +163,9 @@
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
HEADER_SEARCH_PATHS = (
"../../libs/apr-1.2.2",
"../../libs/apr-1.2.2/include",
"../../libs/apr-util-1.2.2",
"../../libs/apr-util-1.2.2/include",
../../src/include,
/Library/Frameworks/apr.framework/Headers,
/Library/Frameworks/aprutil.framework/Headers,
/Library/Frameworks/freeswitch.framework/Headers,
);
INSTALL_PATH = /usr/local/freeswitch/bin;
OTHER_CFLAGS = (
......
mac/xcode/libs/aprutil-1.2.2.xcodeproj/project.pbxproj
浏览文件 @ dabee3cf
......@@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
D3542F0509C3760C000A33C3 /* apr.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3542F0409C3760C000A33C3 /* apr.framework */; };
D3542FF809C37707000A33C3 /* sqlite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3542FF709C37707000A33C3 /* sqlite.framework */; };
D3F0202109C119A200120915 /* apr_anylock.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F0200109C119A200120915 /* apr_anylock.h */; settings = {ATTRIBUTES = (Public, ); }; };
D3F0202209C119A200120915 /* apr_base64.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F0200209C119A200120915 /* apr_base64.h */; settings = {ATTRIBUTES = (Public, ); }; };
D3F0202309C119A200120915 /* apr_buckets.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F0200309C119A200120915 /* apr_buckets.h */; settings = {ATTRIBUTES = (Public, ); }; };
......@@ -107,6 +109,8 @@
/* End PBXBuildStyle section */
/* Begin PBXFileReference section */
D3542F0409C3760C000A33C3 /* apr.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = apr.framework; path = /Library/Frameworks/apr.framework; sourceTree = "<absolute>"; };
D3542FF709C37707000A33C3 /* sqlite.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = sqlite.framework; path = /Library/Frameworks/sqlite.framework; sourceTree = "<absolute>"; };
D3F01FE309C1182700120915 /* aprutil.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = aprutil.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D3F01FE509C1182700120915 /* aprutil-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "aprutil-Info.plist"; sourceTree = "<group>"; };
D3F0200109C119A200120915 /* apr_anylock.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = apr_anylock.h; path = "../../../libs/apr-util-1.2.2/include/apr_anylock.h"; sourceTree = SOURCE_ROOT; };
......@@ -197,6 +201,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D3542F0509C3760C000A33C3 /* apr.framework in Frameworks */,
D3542FF809C37707000A33C3 /* sqlite.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -209,6 +215,8 @@
D3F01FE409C1182700120915 /* aprutil-1.2.2 */,
D3F01FE509C1182700120915 /* aprutil-Info.plist */,
D3F01FE309C1182700120915 /* aprutil.framework */,
D3542FF709C37707000A33C3 /* sqlite.framework */,
D3542F0409C3760C000A33C3 /* apr.framework */,
);
sourceTree = "<group>";
};
......
mac/xcode/libs/libfreeswitch.xcodeproj/project.pbxproj
浏览文件 @ dabee3cf
......@@ -42,6 +42,10 @@
D33CA8DA09C124B70087B539 /* switch_version.h in Headers */ = {isa = PBXBuildFile; fileRef = D33CA8D809C124B70087B539 /* switch_version.h */; settings = {ATTRIBUTES = (Public, ); }; };
D33CA8ED09C1256F0087B539 /* libresample.h in Headers */ = {isa = PBXBuildFile; fileRef = D33CA8EC09C1256F0087B539 /* libresample.h */; settings = {ATTRIBUTES = (Private, ); }; };
D33CA8F909C125D90087B539 /* libresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D33CA8F809C125D90087B539 /* libresample.a */; };
D354302A09C37727000A33C3 /* apr.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D354302609C37727000A33C3 /* apr.framework */; };
D354302B09C37727000A33C3 /* aprutil.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D354302709C37727000A33C3 /* aprutil.framework */; };
D354302C09C37727000A33C3 /* sqlite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D354302809C37727000A33C3 /* sqlite.framework */; };
D354302D09C37727000A33C3 /* teletone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D354302909C37727000A33C3 /* teletone.framework */; };
/* End PBXBuildFile section */
/* Begin PBXBuildStyle section */
......@@ -99,6 +103,10 @@
D33CA8D809C124B70087B539 /* switch_version.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = switch_version.h; path = ../../../src/include/switch_version.h; sourceTree = SOURCE_ROOT; };
D33CA8EC09C1256F0087B539 /* libresample.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = libresample.h; path = "../../../libs/libresample-0.1.3/include/libresample.h"; sourceTree = SOURCE_ROOT; };
D33CA8F809C125D90087B539 /* libresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libresample.a; path = build/resample/libresample.a; sourceTree = "<group>"; };
D354302609C37727000A33C3 /* apr.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = apr.framework; path = /Library/Frameworks/apr.framework; sourceTree = "<absolute>"; };
D354302709C37727000A33C3 /* aprutil.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = aprutil.framework; path = /Library/Frameworks/aprutil.framework; sourceTree = "<absolute>"; };
D354302809C37727000A33C3 /* sqlite.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = sqlite.framework; path = /Library/Frameworks/sqlite.framework; sourceTree = "<absolute>"; };
D354302909C37727000A33C3 /* teletone.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = teletone.framework; path = /Library/Frameworks/teletone.framework; sourceTree = "<absolute>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -107,6 +115,10 @@
buildActionMask = 2147483647;
files = (
D33CA8F909C125D90087B539 /* libresample.a in Frameworks */,
D354302A09C37727000A33C3 /* apr.framework in Frameworks */,
D354302B09C37727000A33C3 /* aprutil.framework in Frameworks */,
D354302C09C37727000A33C3 /* sqlite.framework in Frameworks */,
D354302D09C37727000A33C3 /* teletone.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -118,8 +130,12 @@
children = (
D33CA88709C123900087B539 /* libfreeswitch */,
D33CA88809C123900087B539 /* libfreeswitch-Info.plist */,
D33CA8F809C125D90087B539 /* libresample.a */,
D33CA88609C123900087B539 /* freeswitch.framework */,
D33CA8F809C125D90087B539 /* libresample.a */,
D354302609C37727000A33C3 /* apr.framework */,
D354302709C37727000A33C3 /* aprutil.framework */,
D354302809C37727000A33C3 /* sqlite.framework */,
D354302909C37727000A33C3 /* teletone.framework */,
);
sourceTree = "<group>";
};
......@@ -349,8 +365,8 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = (
"$(FRAMEWORK_SEARCH_PATHS)",
/Library/Frameworks,
"$(FRAMEWORK_SEARCH_PATHS)",
"$(SRCROOT)/build/Release",
);
FRAMEWORK_VERSION = A;
......@@ -362,11 +378,8 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
HEADER_SEARCH_PATHS = (
"../../libs/apr-1.2.2",
"../../libs/apr-1.2.2/include",
"../../libs/apr-util-1.2.2",
"../../libs/apr-util-1.2.2/include",
../../src/include,
/Library/Frameworks/apr.framework/Headers,
/Library/Frameworks/aprutil.framework/Headers,
);
INFOPLIST_FILE = "libfreeswitch-Info.plist";
INSTALL_PATH = /Library/Frameworks;
......@@ -375,6 +388,14 @@
"$(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)\"",
......
mac/xcode/libs/teletone.xcodeproj/project.pbxproj
浏览文件 @ dabee3cf
......@@ -32,7 +32,7 @@
/* End PBXBuildStyle section */
/* Begin PBXFileReference section */
D37F3EC409C0F660002C93D4 /* teletone.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = teletone.framework; path = build/teletone/teletone.framework; sourceTree = "<group>"; };
D37F3EC409C0F660002C93D4 /* teletone.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = teletone.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D37F3EC609C0F660002C93D4 /* teletone-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "teletone-Info.plist"; sourceTree = "<group>"; };
D37F3ED809C0F707002C93D4 /* libteletone_detect.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = libteletone_detect.c; path = ../../../libs/libteletone/src/libteletone_detect.c; sourceTree = "<group>"; };
D37F3ED909C0F707002C93D4 /* libteletone_detect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = libteletone_detect.h; path = ../../../libs/libteletone/src/libteletone_detect.h; sourceTree = "<group>"; };
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论