Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sqlcipher/sqlcipher
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
Loading
...
head repository: cloudshark/sqlcipher
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Checking mergeability… Don’t worry, you can still create the pull request.
  • 3 commits
  • 8 files changed
  • 2 contributors

Commits on Dec 21, 2012

  1. Rename installed files from sqlite3 to sqlite3-cipher

    sqlcipher has the annoying habit of overwriting an already installed
    version of sqlite3, esepcially if it is installed to the same prefix
    where a normal SQLite 3 would be installed. Unfortunately this causes
    issues because programs require certain versions of sqlite3 and don't
    work with the version that is installed with sqlcipher.
    
    This renames a couple of key files, sets up better defaults in the
    configure file and allows a sqlite3 install to co-exist happily with a
    sqlcipher install.
    
    The following files are installed by this modification:
    
        ./bin
        ./bin/sqlite3-cipher
        ./include
        ./include/sqlite3-cipher.h
        ./include/sqlite3ext-cipher.h
        ./lib
        ./lib/libsqlite3-cipher.0.dylib
        ./lib/libsqlite3-cipher.a
        ./lib/libsqlite3-cipher.dylib
        ./lib/libsqlite3-cipher.la
        ./lib/pkgconfig
        ./lib/pkgconfig/sqlite3-cipher.pc
    
    (On Mac OS X at least).
    
    Programs can now use pkg-config on the name sqlite3-cipher to get the
    new lib they are to link against, and instead of including sqlite3.h
    they include sqlite3-cipher.h.
    
    It is not possible to link against both sqlcipher and sqlite3 at the
    same time, so if there are static libraries that are linked against
    sqlite3 you can't link them into a project using sqlcipher eventhough
    the name is different, they both still export the same exact names.
    
    Ugh, what a mess.
    digitalresistor committed Dec 21, 2012
    Configuration menu
    Copy the full SHA
    946324d View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2012

  1. Forgot to symlink sqlite3.h so it is available

    This fixes a mistake in Makefile.in that caused it to not have a
    sqlite3.h file available, which means that unless sqlite3 is installed
    on the system it won't build.
    digitalresistor committed Dec 22, 2012
    Configuration menu
    Copy the full SHA
    ed0dc92 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2013

  1. Configuration menu
    Copy the full SHA
    4bf6e90 View commit details
    Browse the repository at this point in the history
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.