Skip to content

Fix sqlcipher and OSX 10.10 build. #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2015

Conversation

jehoffmann
Copy link
Contributor

Building under Mac OS X 10.10 was broken using QT SDK 5.4. Add
missing macextras.

To be able to build against sqlcipher fix INCLUDEPATH for mac by removing the -I from PATH.

Building under Mac OS X 10.10 was broken using latest QT SDK. Add
missing macextras and fix INCLUDEPATH for mac.
@justinclift
Copy link
Member

Ahhhh interesting. I haven't tried OSX 10.10 at all yet.

I'll try to get it running in a VM later on today, verify this, then merge it. 😄

@justinclift
Copy link
Member

(Sorry for the delay btw, have been unwell for a few days)

INCLUDEPATH += -I/usr/local/include \
-I/usr/local/opt/sqlite/include
QT+= macextras
INCLUDEPATH += /usr/local/include \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm, this may have been why I wasn't able to build with SQLCipher support on OSX 10.9 a while ago (but didn't bother looking into it :/).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without this patch you will get a '-I-I' in the compiler command. That's why the SQLCipher build broke.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that's what I remember seeing. 😉

I've just installed Yosemite in a VM, so am going through getting Homebrew functional so I can test this.

@justinclift
Copy link
Member

Yep, working well here on OSX 10.10. The existing codebase (without this patch) barfs.

justinclift added a commit that referenced this pull request Jul 16, 2015
Fix sqlcipher and OSX 10.10 build.
@justinclift justinclift merged commit a9670fb into sqlitebrowser:master Jul 16, 2015
@justinclift
Copy link
Member

Thanks @jehoffmann! 😀

@justinclift justinclift added bug Confirmed bugs or reports that are very likely to be bugs. fix applied labels Jul 16, 2015
@justinclift justinclift added this to the 3.8.0 - Awesome Sauce! milestone Jul 16, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Confirmed bugs or reports that are very likely to be bugs.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy