Skip to content

Commit 3d40c2f

Browse files
Cleanup defined CFLAG's used for the project
Remove duplicate and no longer valid CFLAG's
1 parent 7887166 commit 3d40c2f

File tree

1 file changed

+21
-10
lines changed

1 file changed

+21
-10
lines changed

Makefile

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,34 @@ LIBS_DIR := ${CURDIR}/libs
55
EXTERNAL_DIR := ${CURDIR}/external
66
SQLCIPHER_DIR := ${CURDIR}/external/sqlcipher
77
LICENSE := ${CURDIR}/SQLCIPHER_LICENSE
8-
SQLCIPHER_CFLAGS := -DHAVE_USLEEP=1 -DSQLITE_HAS_CODEC \
9-
-DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576 -DSQLITE_THREADSAFE=1 -DNDEBUG=1 \
10-
-DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 -DSQLITE_TEMP_STORE=3 \
11-
-DSQLITE_ENABLE_FTS3_BACKWARDS -DSQLITE_ENABLE_LOAD_EXTENSION \
12-
-DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_COLUMN_METADATA \
13-
-DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_ENABLE_RTREE \
14-
-DSQLITE_SOUNDEX -DSQLITE_ENABLE_STAT3 -DSQLITE_ENABLE_FTS4_UNICODE61 \
15-
-DSQLITE_THREADSAFE -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
16-
-DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_FTS5 -DSQLCIPHER_CRYPTO_OPENSSL
8+
SQLCIPHER_CFLAGS := \
9+
-DSQLITE_HAS_CODEC \
10+
-DSQLITE_SOUNDEX \
11+
-DHAVE_USLEEP=1 \
12+
-DSQLITE_TEMP_STORE=3 \
13+
-DSQLITE_THREADSAFE=1 \
14+
-DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576 \
15+
-DNDEBUG=1 \
16+
-DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 \
17+
-DSQLITE_ENABLE_LOAD_EXTENSION \
18+
-DSQLITE_ENABLE_COLUMN_METADATA \
19+
-DSQLITE_ENABLE_UNLOCK_NOTIFY \
20+
-DSQLITE_ENABLE_RTREE \
21+
-DSQLITE_ENABLE_STAT3 \
22+
-DSQLITE_ENABLE_STAT4 \
23+
-DSQLITE_ENABLE_JSON1 \
24+
-DSQLITE_ENABLE_FTS3_PARENTHESIS \
25+
-DSQLITE_ENABLE_FTS4 \
26+
-DSQLITE_ENABLE_FTS5 \
27+
-DSQLCIPHER_CRYPTO_OPENSSL
1728

1829
.PHONY: clean develop-zip release-zip release
1930

2031
init: init-environment build-openssl-libraries
2132

2233
init-environment:
2334
git submodule update --init
24-
android update project -p ${CURDIR}
35+
#android update project -p ${CURDIR}
2536

2637
build-openssl-libraries:
2738
./build-openssl-libraries.sh

0 commit comments

Comments
 (0)