Skip to content

Commit 38da285

Browse files
Eugene KalyadaEugene Kalyada
authored andcommitted
new integration on cipher
1 parent 0a35719 commit 38da285

File tree

14 files changed

+21619
-3
lines changed

14 files changed

+21619
-3
lines changed

SQLite.xcodeproj/project.pbxproj

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@
228228
3D67B3E51DB2469200A4F4C6 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS3.0.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; };
229229
49EB68C31F7B3CB400D89D40 /* Coding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Coding.swift; sourceTree = "<group>"; };
230230
A121AC451CA35C79005A31D1 /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
231+
A1A1E17B205F7F45008BAC88 /* SQLCipher.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SQLCipher.framework; sourceTree = "<group>"; };
231232
EE247AD31C3F04ED00AE3E12 /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
232233
EE247AD61C3F04ED00AE3E12 /* SQLite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SQLite.h; sourceTree = "<group>"; };
233234
EE247AD81C3F04ED00AE3E12 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -426,6 +427,7 @@
426427
EE247AED1C3F06E900AE3E12 /* Core */ = {
427428
isa = PBXGroup;
428429
children = (
430+
A1A1E17B205F7F45008BAC88 /* SQLCipher.framework */,
429431
EE91808D1C46E5230038162A /* SQLite-Bridging.h */,
430432
EE247AEE1C3F06E900AE3E12 /* Blob.swift */,
431433
EE247AEF1C3F06E900AE3E12 /* Connection.swift */,
@@ -1260,17 +1262,24 @@
12601262
"$(inherited)",
12611263
"$(PROJECT_DIR)",
12621264
);
1265+
GCC_PREPROCESSOR_DEFINITIONS = (
1266+
"DEBUG=1",
1267+
"$(inherited)",
1268+
);
12631269
INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist";
12641270
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
12651271
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
12661272
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1267-
OTHER_SWIFT_FLAGS = "$(inherited) -DSQLITE_SWIFT_SQLCIPHER $(inherited)";
1273+
OTHER_CFLAGS = "";
1274+
OTHER_LDFLAGS = "";
1275+
OTHER_SWIFT_FLAGS = "$(inherited)";
12681276
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
12691277
PRODUCT_NAME = SQLite;
12701278
SKIP_INSTALL = YES;
12711279
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
12721280
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
12731281
SWIFT_VERSION = 4.0;
1282+
SYSTEM_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/Sources/SQLite/sqlcipher";
12741283
};
12751284
name = Debug;
12761285
};
@@ -1288,16 +1297,20 @@
12881297
"$(inherited)",
12891298
"$(PROJECT_DIR)",
12901299
);
1300+
GCC_PREPROCESSOR_DEFINITIONS = "";
12911301
INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist";
12921302
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
12931303
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
12941304
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1295-
OTHER_SWIFT_FLAGS = "$(inherited) -DSQLITE_SWIFT_SQLCIPHER $(inherited)";
1305+
OTHER_CFLAGS = "";
1306+
OTHER_LDFLAGS = "";
1307+
OTHER_SWIFT_FLAGS = "$(inherited)";
12961308
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
12971309
PRODUCT_NAME = SQLite;
12981310
SKIP_INSTALL = YES;
12991311
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
13001312
SWIFT_VERSION = 4.0;
1313+
SYSTEM_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/Sources/SQLite/sqlcipher";
13011314
};
13021315
name = Release;
13031316
};
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#ifdef __OBJC__
2+
#import <UIKit/UIKit.h>
3+
#else
4+
#ifndef FOUNDATION_EXPORT
5+
#if defined(__cplusplus)
6+
#define FOUNDATION_EXPORT extern "C"
7+
#else
8+
#define FOUNDATION_EXPORT extern
9+
#endif
10+
#endif
11+
#endif
12+
13+
#import "sqlite3.h"
14+
15+
FOUNDATION_EXPORT double SQLCipherVersionNumber;
16+
FOUNDATION_EXPORT const unsigned char SQLCipherVersionString[];
17+

0 commit comments

Comments
 (0)