New project files. #7
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: CK2SSHCredential.m
|
If this is deemed useful I'll give the same treatment to libcurl in the CurlHandle submodule. |
…igures out user for itself
Conflicts: CK2SFTPSession.m CK2SSHCredential.h CK2SSHCredential.m OpenSSL.xcodeproj/project.pbxproj libcrypto.dylib libcrypto.dylib.dSYM/Contents/Resources/DWARF/libcrypto.dylib libssh2.dylib libssh2.dylib.dSYM/Contents/Resources/DWARF/libssh2.dylib libssh2.xcodeproj/project.pbxproj libssl.dylib libssl.dylib.dSYM/Contents/Resources/DWARF/libssl.dylib openssl
Conflicts: libcrypto.dylib libcrypto.dylib.dSYM/Contents/Resources/DWARF/libcrypto.dylib libssh2.dylib libssh2.dylib.dSYM/Contents/Resources/DWARF/libssh2.dylib libssl.dylib libssl.dylib.dSYM/Contents/Resources/DWARF/libssl.dylib openssl
Conflicts: Sources/CK2SFTPSession.m libcrypto.dylib libcrypto.dylib.dSYM/Contents/Resources/DWARF/libcrypto.dylib libssh2.dylib libssh2.dylib.dSYM/Contents/Resources/DWARF/libssh2.dylib libssl.dylib libssl.dylib.dSYM/Contents/Resources/DWARF/libssl.dylib openssl
…ckwards compatibility shenanigans (iOS upgrade speed and breadth is much greater than OSX anyway).
This was referenced Apr 21, 2013
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I made new project files so the libraries can be added as target dependencies and linked in, and so that the headers can be included from the build products directory.
This makes the project a bit more similar to how a normal Xcode library would behave, although rebuilding the libraries still requires manual input. The build scripts will skip building if the library is already built, so if you change the version you have to clean the targets. Cleaning from within Xcode works fine, no need to go delete the derived data from the finder.
Building libssh2 requires automake, autoconf and GNU libtool but since even the original scripts added brew / macports to the path I don't think that's a big issue.