Skip to content
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: groue/sqlcipher
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Marus/sqlcipher
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 7 files changed
  • 3 contributors

Commits on Jul 25, 2018

  1. Extract compiler flags to sqlcipher.xcconfig

    @groue @Marus
    groue authored and Marus committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    dd45bcf View commit details
    Browse the repository at this point in the history

  2. Fix iOS builds from command line (xcodebuild) 

    For whatever reason, it seems when building inside Xcode.app, the
amalgamation target has environment variables set as if it is being
built for macOS (even when building the iOS library), so the
configure/make steps work fine.

However, when building via the command line (ie: `xcodebuild -scheme
sqlcipher -configuration Release -sdk iphoneos`), the amalgamation
target was getting environment variables set as if it was building for
iOS. This was causing the `configure` step to fail, because it thought
the compiler was broken (macOS couldn't run binaries that were being
built for iOS).

This commit fixes the issue by always running configure as if we were
building for macOS. (The sqlcipher target will still build libraries
for the correct platform, as it did before)
    @darrenclark @Marus
    darrenclark authored and Marus committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    36390eb View commit details
    Browse the repository at this point in the history

  3. Project file changes 

    - Remove the SQLCipher OSX/iOS/watchOS/tvOS schemes
- Add a 'sqlcipher' scheme that supports all 4 of the plaforms
- Update SUPPORTED_PLATFORMS to include all 4 platforms
  and their simulator counterparts, add armv7k (Watch) to VALID_ARCHS
    @darrenclark @Marus
    darrenclark authored and Marus committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    c36888d View commit details
    Browse the repository at this point in the history

  4. Enable FTS5 in SQLCipher build flags

    @Marus
    Marus committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    d139a2b View commit details
    Browse the repository at this point in the history
Loading