diff --git a/README.md b/README.md index ee10d0a..f9e53c5 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,12 @@ Compiling with XCode is a little bit problematic, since it requries you to compi 1. Get the Adium source, compile it with XCode and copy the build output into telegram-adium/Frameworks/Adium. It should contain at least Adium.framework, AdiumLibpurple.framework and AIUitilies.framework 2. Open the Adium source code, go to ./Frameworks and copy libglib.framework and libpurple.framework into telegram-adium/Frameworks/Adium 3. Build the tgl submodule and delete libtgl.so from libs/ (it should only contain libtgl.a) -4. Build the XCode-Project and execute the created bundle +4. Install libwebp with homebrew, move into copy it into your project + + brew install webp + cp /usr/local/Cellar/webp/0.4.3/lib/libwebp.a ./telegram-adium/Frameworks/ + +5. Build the XCode-Project and execute the created bundle Authors ------- diff --git a/telegram-adium/telegram-adium.xcodeproj/project.pbxproj b/telegram-adium/telegram-adium.xcodeproj/project.pbxproj index 8b81831..ed018ca 100644 --- a/telegram-adium/telegram-adium.xcodeproj/project.pbxproj +++ b/telegram-adium/telegram-adium.xcodeproj/project.pbxproj @@ -39,11 +39,11 @@ C4B4BE331AB4536F0064AC17 /* PurpleDefaultsTelegram.plist in Resources */ = {isa = PBXBuildFile; fileRef = C4B4BE321AB4536F0064AC17 /* PurpleDefaultsTelegram.plist */; }; C4B4BE371AB5FB5C0064AC17 /* TelegramJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C4B4BE351AB5FB5C0064AC17 /* TelegramJoinChatViewController.m */; }; C4B4BE391AB613950064AC17 /* TelegramJoinChatView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C4B4BE381AB613950064AC17 /* TelegramJoinChatView.xib */; }; - C4B57BE71B10C652006997F4 /* libwebp.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = C4B57BE61B10C652006997F4 /* libwebp.dylib */; }; C4B57BF01B1598D4006997F4 /* libtgl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C4B57BEF1B1598D4006997F4 /* libtgl.a */; }; C4D819031A5C85FE0044CBA9 /* lodepng.c in Sources */ = {isa = PBXBuildFile; fileRef = C4D819011A5C85FE0044CBA9 /* lodepng.c */; }; C4D819061A5C862E0044CBA9 /* tgp-structs.c in Sources */ = {isa = PBXBuildFile; fileRef = C4D819041A5C862E0044CBA9 /* tgp-structs.c */; }; C4E528111A8A907200C4B915 /* tgp-ft.c in Sources */ = {isa = PBXBuildFile; fileRef = C4E5280F1A8A907200C4B915 /* tgp-ft.c */; }; + C4EA965A1B204C67006CBAD0 /* libwebp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C4EA96591B204C67006CBAD0 /* libwebp.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -110,7 +110,6 @@ C4B4BE361AB5FB5C0064AC17 /* TelegramJoinChatViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TelegramJoinChatViewController.h; sourceTree = ""; }; C4B4BE381AB613950064AC17 /* TelegramJoinChatView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TelegramJoinChatView.xib; sourceTree = ""; }; C4B57BE51B109E6D006997F4 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; - C4B57BE61B10C652006997F4 /* libwebp.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libwebp.dylib; path = ../../../../../usr/local/lib/libwebp.dylib; sourceTree = ""; }; C4B57BE81B10D814006997F4 /* configure.ac */ = {isa = PBXFileReference; lastKnownFileType = text; name = configure.ac; path = ../configure.ac; sourceTree = ""; }; C4B57BE91B10D822006997F4 /* Makefile.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = Makefile.in; path = ../Makefile.in; sourceTree = ""; }; C4B57BEC1B13B2C4006997F4 /* auto-types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "auto-types.h"; path = "../auto/auto-types.h"; sourceTree = ""; }; @@ -122,6 +121,7 @@ C4D819051A5C862E0044CBA9 /* tgp-structs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "tgp-structs.h"; path = "../tgp-structs.h"; sourceTree = ""; }; C4E5280F1A8A907200C4B915 /* tgp-ft.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "tgp-ft.c"; path = "../tgp-ft.c"; sourceTree = ""; }; C4E528101A8A907200C4B915 /* tgp-ft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "tgp-ft.h"; path = "../tgp-ft.h"; sourceTree = ""; }; + C4EA96591B204C67006CBAD0 /* libwebp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebp.a; path = Frameworks/libwebp.a; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -130,6 +130,7 @@ buildActionMask = 2147483647; files = ( C4B57BF01B1598D4006997F4 /* libtgl.a in Frameworks */, + C4EA965A1B204C67006CBAD0 /* libwebp.a in Frameworks */, C40564871A7937C600A293B9 /* AdiumLibpurple.framework in Frameworks */, C487A18C1A792E9B0044F135 /* Adium.framework in Frameworks */, C487A18E1A792E9B0044F135 /* AIUtilities.framework in Frameworks */, @@ -139,7 +140,6 @@ C466937819E703370036A108 /* AppKit.framework in Frameworks */, C49A915819BBC5C5001B3DC0 /* libz.dylib in Frameworks */, C410948A19BB2D7D0083BF3F /* CoreFoundation.framework in Frameworks */, - C4B57BE71B10C652006997F4 /* libwebp.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -187,8 +187,8 @@ isa = PBXGroup; children = ( C4B57BEF1B1598D4006997F4 /* libtgl.a */, + C4EA96591B204C67006CBAD0 /* libwebp.a */, C4B57BED1B1598BE006997F4 /* telegram-purple */, - C4B57BE61B10C652006997F4 /* libwebp.dylib */, C40564861A7937C600A293B9 /* AdiumLibpurple.framework */, C487A18F1A792EA50044F135 /* libglib.framework */, C487A1901A792EA50044F135 /* libpurple.framework */, @@ -518,7 +518,8 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/../libs", - /usr/local/lib, + "$(PROJECT_DIR)", + "$(PROJECT_DIR)/Frameworks", ); OTHER_CFLAGS = "-DPURPLE_STATIC_PRPL"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -557,6 +558,7 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/../libs", /usr/local/lib, + "$(PROJECT_DIR)/Frameworks", ); OTHER_CFLAGS = "-DPURPLE_STATIC_PRPL"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/telegram-adium/telegram-adium.xcodeproj/xcuserdata/matj.xcuserdatad/xcschemes/telegram-adium.xcscheme b/telegram-adium/telegram-adium.xcodeproj/xcuserdata/matj.xcuserdatad/xcschemes/telegram-adium.xcscheme index 1176c1d..5b295fd 100644 --- a/telegram-adium/telegram-adium.xcodeproj/xcuserdata/matj.xcuserdatad/xcschemes/telegram-adium.xcscheme +++ b/telegram-adium/telegram-adium.xcodeproj/xcuserdata/matj.xcuserdatad/xcschemes/telegram-adium.xcscheme @@ -40,6 +40,8 @@ debugDocumentVersioning = "YES" allowLocationSimulation = "YES"> diff --git a/telegram-adium/telegram-adium/telegram-adium-Info.plist b/telegram-adium/telegram-adium/telegram-adium-Info.plist index 6b087ff..3dfa3e2 100644 --- a/telegram-adium/telegram-adium/telegram-adium-Info.plist +++ b/telegram-adium/telegram-adium/telegram-adium-Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.0.0 + 1.1.0 CFBundleSignature AdIM CFBundleVersion