Skip to content

Commit

Permalink
Changed from pjsip 1.12 to latest 1.x version
Browse files Browse the repository at this point in the history
  • Loading branch information
@mike42
mike42 committed Aug 3, 2012
1 parent 4d36936 commit 25344d6
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 38 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Expand Up @@ -13,7 +13,7 @@ near Telephone, in the same parent directory.

[pjsip]: http://www.pjsip.org/

$ svn checkout http://svn.pjsip.org/repos/pjproject/tags/1.12 pjproject
$ svn checkout http://svn.pjsip.org/repos/pjproject/branches/1.x pjproject
$ cd pjproject

Create the file `pjlib/include/pj/config_site.h` with the following
Expand Down
4 changes: 2 additions & 2 deletions Telephone-Info.plist
View file
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.4</string>
<string>1.0.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -40,7 +40,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>104</string>
<string>105</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSHasLocalizedDisplayName</key>
Expand Down
78 changes: 43 additions & 35 deletions Telephone.xcodeproj/project.pbxproj
View file
Expand Up @@ -679,7 +679,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0420;
LastUpgradeCheck = 0440;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Telephone" */;
compatibilityVersion = "Xcode 3.2";
Expand Down Expand Up @@ -1071,6 +1071,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
Expand All @@ -1090,6 +1091,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
Expand All @@ -1109,6 +1111,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
Expand All @@ -1133,6 +1136,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
Expand All @@ -1156,13 +1160,15 @@
AAF99B2E14A2577D00D087DC /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
AAF99B2F14A2577D00D087DC /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
Expand All @@ -1171,6 +1177,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1203,23 +1210,23 @@
"-DNDEBUG",
);
OTHER_LDFLAGS = (
"-lpjsua-i386-apple-darwin11.3.0",
"-lpjsip-ua-i386-apple-darwin11.3.0",
"-lpjsip-simple-i386-apple-darwin11.3.0",
"-lpjsip-i386-apple-darwin11.3.0",
"-lpjmedia-codec-i386-apple-darwin11.3.0",
"-lpjmedia-i386-apple-darwin11.3.0",
"-lpjmedia-audiodev-i386-apple-darwin11.3.0",
"-lpjnath-i386-apple-darwin11.3.0",
"-lpjlib-util-i386-apple-darwin11.3.0",
"-lresample-i386-apple-darwin11.3.0",
"-lmilenage-i386-apple-darwin11.3.0",
"-lsrtp-i386-apple-darwin11.3.0",
"-lgsmcodec-i386-apple-darwin11.3.0",
"-lspeex-i386-apple-darwin11.3.0",
"-lilbccodec-i386-apple-darwin11.3.0",
"-lportaudio-i386-apple-darwin11.3.0",
"-lpj-i386-apple-darwin11.3.0",
"-lpjsua-i386-apple-darwin11.4.0",
"-lpjsip-ua-i386-apple-darwin11.4.0",
"-lpjsip-simple-i386-apple-darwin11.4.0",
"-lpjsip-i386-apple-darwin11.4.0",
"-lpjmedia-codec-i386-apple-darwin11.4.0",
"-lpjmedia-i386-apple-darwin11.4.0",
"-lpjmedia-audiodev-i386-apple-darwin11.4.0",
"-lpjnath-i386-apple-darwin11.4.0",
"-lpjlib-util-i386-apple-darwin11.4.0",
"-lresample-i386-apple-darwin11.4.0",
"-lmilenage-i386-apple-darwin11.4.0",
"-lsrtp-i386-apple-darwin11.4.0",
"-lgsmcodec-i386-apple-darwin11.4.0",
"-lspeex-i386-apple-darwin11.4.0",
"-lilbccodec-i386-apple-darwin11.4.0",
"-lportaudio-i386-apple-darwin11.4.0",
"-lpj-i386-apple-darwin11.4.0",
);
PRODUCT_NAME = Telephone;
};
Expand All @@ -1229,6 +1236,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1259,23 +1267,23 @@
"-DNDEBUG",
);
OTHER_LDFLAGS = (
"-lpjsua-i386-apple-darwin11.3.0",
"-lpjsip-ua-i386-apple-darwin11.3.0",
"-lpjsip-simple-i386-apple-darwin11.3.0",
"-lpjsip-i386-apple-darwin11.3.0",
"-lpjmedia-codec-i386-apple-darwin11.3.0",
"-lpjmedia-i386-apple-darwin11.3.0",
"-lpjmedia-audiodev-i386-apple-darwin11.3.0",
"-lpjnath-i386-apple-darwin11.3.0",
"-lpjlib-util-i386-apple-darwin11.3.0",
"-lresample-i386-apple-darwin11.3.0",
"-lmilenage-i386-apple-darwin11.3.0",
"-lsrtp-i386-apple-darwin11.3.0",
"-lgsmcodec-i386-apple-darwin11.3.0",
"-lspeex-i386-apple-darwin11.3.0",
"-lilbccodec-i386-apple-darwin11.3.0",
"-lportaudio-i386-apple-darwin11.3.0",
"-lpj-i386-apple-darwin11.3.0",
"-lpjsua-i386-apple-darwin11.4.0",
"-lpjsip-ua-i386-apple-darwin11.4.0",
"-lpjsip-simple-i386-apple-darwin11.4.0",
"-lpjsip-i386-apple-darwin11.4.0",
"-lpjmedia-codec-i386-apple-darwin11.4.0",
"-lpjmedia-i386-apple-darwin11.4.0",
"-lpjmedia-audiodev-i386-apple-darwin11.4.0",
"-lpjnath-i386-apple-darwin11.4.0",
"-lpjlib-util-i386-apple-darwin11.4.0",
"-lresample-i386-apple-darwin11.4.0",
"-lmilenage-i386-apple-darwin11.4.0",
"-lsrtp-i386-apple-darwin11.4.0",
"-lgsmcodec-i386-apple-darwin11.4.0",
"-lspeex-i386-apple-darwin11.4.0",
"-lilbccodec-i386-apple-darwin11.4.0",
"-lportaudio-i386-apple-darwin11.4.0",
"-lpj-i386-apple-darwin11.4.0",
);
PRODUCT_NAME = Telephone;
};
Expand Down

0 comments on commit 25344d6

Please sign in to comment.