Stephen Lombardo
0b08b57f61
Merge branch 'prerelease' into ditto
2013-10-15 14:14:06 -04:00
Billy Gray
d2a266e104
adjusts xcodeproj, resumes use of amalgation target as dependency, no longer needs manual/makefile build
2013-10-14 11:53:15 -04:00
Billy Gray
894b8ac578
minor adjustments to .xcodeproj
2013-10-14 11:40:58 -04:00
Billy Gray
423fd374db
Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into ditto
2013-09-27 13:01:45 -04:00
Billy Gray
cf42f10c5d
sets iOS 4.3 as base deployment target, overrides to 6.0 as required for arm64 arch
2013-09-13 12:35:32 -04:00
Billy Gray
94abbd2595
specifies all valid archs for xcode-build compatibility with other platforms
2013-09-12 17:51:47 -04:00
Billy Gray
58c95b38b2
adds archs settings branch for Any iOS Simulator SDK which defaults to i386 instead of standard archs+64, overrident to standard+64
2013-09-12 16:04:47 -04:00
Billy Gray
4093d93e68
adjusts sqlcipher.xcodeproj, attempting to switch to new standard archs including 64bit, but simulator still building i386
2013-09-12 15:56:03 -04:00
Billy Gray
dffb49da90
Merge branch 'prerelease' into ditto
...
Conflicts:
sqlcipher.xcodeproj/project.pbxproj
2013-08-28 18:33:10 -04:00
Billy Gray
3343aaf77e
corrects use of openssl api to commoncrypto, links Security.framework, re-links libsqlcipher.a to fix archive errors, removes use of openssl
2013-08-27 16:05:48 -04:00
Billy Gray
f1069eeefe
Unlinks amalgamation target as dependency, run make to execute amalgamation by Makefile before building in Xcode
2013-08-27 12:05:26 -04:00
Billy Gray
4534af9072
updates amalgamation script, but we'll probably have to drop it for Makefile
2013-08-27 11:48:48 -04:00
Nick Parker
b13e77f669
Merge branch 'prerelease'
2013-06-27 09:24:30 -05:00
Billy Gray
6271ceb2df
Merge branch 'prerelease' into ditto
...
Conflicts:
src/func.c
2013-06-14 12:35:37 -04:00
Stephen Lombardo
ed1e161168
remove -DNDEBUG flag on debug builds
2013-02-25 13:59:50 -05:00
Billy Gray
6d7b067bef
Merge branch 'master' into ditto
2012-11-08 11:49:07 -05:00
Stephen Lombardo
ceee996119
update XCode project for 4.5, armv7s, drop armv6
2012-09-24 11:08:29 -04:00
Stephen Lombardo
02e219091d
Revert "Use flag to default number of iterations to 10000"
...
This reverts commit 1a935545bb
2012-05-30 00:43:12 -04:00
Billy Gray
1a935545bb
Use flag to default number of iterations to 10000
2012-04-10 14:21:04 -04:00
Stephen Lombardo
1fdb22fb8c
Merge branch 'master' into ditto
2012-02-29 12:02:55 -05:00
Stephen Lombardo
885ffa94a4
update xcode project file to set -mno-thumb for armv6 only
2012-02-29 11:56:30 -05:00
Billy Gray
0dc7a372dd
minor merge conflict resolved
...
Merge branch 'master' into ditto
Conflicts:
src/func.c
2012-02-02 14:53:53 -05:00
Stephen Lombardo
ff9a340039
add -mno-thumb cflag to avoid armv6 crash
2012-01-25 01:17:51 -05:00
Billy Gray
b780ebd0c7
Merge branch 'ditto' of github.com:sjlombardo/sqlcipher into ditto
2011-10-14 16:42:44 -04:00
Billy Gray
6b55a5170b
project file modernization by Xcode 4.2
2011-10-14 16:42:02 -04:00
Billy Gray
cb5a77187d
Revert "remove the customizations that were merged in with the project file changes we made on the ditto branch"
...
Doing this to restore Ditto includes on our down-stream branch.
Note: no changes should be made to this branch for up-stream merging!
This reverts commit ff64398d84
2011-10-12 15:36:51 -04:00
Billy Gray
ff64398d84
remove the customizations that were merged in with the project file changes we made on the ditto branch
2011-10-12 15:31:42 -04:00
Billy Gray
1d437e4121
add -DSQLITE_THREADSAFE to CFLAGS
2011-09-27 17:44:33 -04:00
Billy Gray
36bb995e4e
avoid having macosx set as the basesdk, thanks xcode
2011-09-14 12:34:28 -04:00
Billy Gray
22e0566bd6
adjust to support simulator (i386) builds on x86_64 kernel os x lion for xcode 4.1
2011-09-12 15:20:10 -04:00
Billy Gray
4280b29e23
okay, xcode, sure
2011-06-14 17:31:45 -04:00
Billy Gray
84c3ee9b64
correct overrides to support uiversal builds
2011-06-08 14:08:34 -07:00
Stephen Lombardo
3bebc079a4
Merge branch 'master' into ditto
2011-03-14 12:14:09 -04:00
Stephen Lombardo
df4dc37c34
set SKIP_INSTALL for XC4 compat
2011-03-14 12:13:30 -04:00
Stephen Lombardo
f13ba3d21e
set architecture and products at project level, including armv7
2011-03-12 23:58:13 -05:00
Stephen Lombardo
54fb0db816
Add explicit list of supported platforms and architectures to project build settings for compatibility with XCode 4
2011-03-12 22:39:18 -05:00
Stephen Lombardo
3496247069
Merge branch 'master' into ditto
2010-08-28 08:55:02 -04:00
Stephen Lombardo
201197adbb
minor tweaks to configure / build defines
2010-08-28 08:52:39 -04:00
Stephen Lombardo
900429e356
Merge branch 'master' into ditto
2010-05-18 22:03:01 -04:00
Stephen Lombardo
c0cf162583
explicitly use /usr/bin/gcc to avoid conifgure issues under armv6 builds
2010-05-18 22:00:28 -04:00
Stephen Lombardo
c6042bb75f
add ditto include directory based on $(DITTO_SRC) to project c flags
2009-12-09 13:02:35 -05:00
Stephen Lombardo
b66dd49202
patches to allow ditto to be compiled statically
2009-12-05 19:57:48 -05:00
Stephen Lombardo
135ac7be93
compile with SQLITE_TEMP_STORE=2 to use memory temp store by default
2009-06-23 11:55:26 -04:00
Stephen Lombardo
06cad3fe22
disable assertions in sqlite3 amalgamation compile flags
2009-05-30 01:04:20 -04:00
Stephen Lombardo
c892464f31
Added XCode static library project
2009-05-29 23:13:10 -04:00
Stephen Lombardo