Skip to content

Commit 3343aaf

Browse files
billymeltdownbillymeltdown
committed
corrects use of openssl api to commoncrypto, links Security.framework, re-links libsqlcipher.a to fix archive errors, removes use of openssl
1 parent f1069ee commit 3343aaf

File tree

1 file changed

+14
-18
lines changed

1 file changed

+14
-18
lines changed

‎sqlcipher.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@
2121
/* End PBXAggregateTarget section */
2222

2323
/* Begin PBXBuildFile section */
24+
28B46E6317CD07A700672510 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28B46E6217CD07A600672510 /* Security.framework */; };
2425
9069D0A30FCE1A4D0042E34C /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; };
2526
/* End PBXBuildFile section */
2627

2728
/* Begin PBXFileReference section */
29+
28B46E6217CD07A600672510 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
2830
9069D0A20FCE1A4D0042E34C /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqlite3.c; sourceTree = "<group>"; };
2931
D2AAC046055464E500DB518D /* libsqlcipher.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsqlcipher.a; sourceTree = BUILT_PRODUCTS_DIR; };
3032
/* End PBXFileReference section */
@@ -34,6 +36,7 @@
3436
isa = PBXFrameworksBuildPhase;
3537
buildActionMask = 2147483647;
3638
files = (
39+
28B46E6317CD07A700672510 /* Security.framework in Frameworks */,
3740
);
3841
runOnlyForDeploymentPostprocessing = 0;
3942
};
@@ -43,6 +46,7 @@
4346
08FB7794FE84155DC02AAC07 /* sqlcipher */ = {
4447
isa = PBXGroup;
4548
children = (
49+
28B46E6217CD07A600672510 /* Security.framework */,
4650
08FB7795FE84155DC02AAC07 /* Source */,
4751
C6A0FF2B0290797F04C91782 /* Documentation */,
4852
1AB674ADFE9D54B511CA2CBB /* Products */,
@@ -170,21 +174,20 @@
170174
GCC_DYNAMIC_NO_PIC = NO;
171175
GCC_MODEL_TUNING = G5;
172176
GCC_OPTIMIZATION_LEVEL = 0;
173-
HEADER_SEARCH_PATHS = (
174-
"$(PROJECT_DIR)",
175-
"$(OPENSSL_SRC)/include",
176-
);
177+
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
177178
INSTALL_PATH = /usr/local/lib;
178179
OTHER_CFLAGS = (
179180
"-DSQLITE_HAS_CODEC",
180181
"-DSQLITE_TEMP_STORE=2",
181182
"-DSQLITE_THREADSAFE",
183+
"-DSQLCIPHER_CRYPTO_CC",
182184
);
183185
"OTHER_CFLAGS[arch=armv6]" = (
184186
"-mno-thumb",
185187
"-DSQLITE_HAS_CODEC",
186188
"-DSQLITE_TEMP_STORE=2",
187189
"-DSQLITE_THREADSAFE",
190+
"-DSQLCIPHER_CRYPTO_CC",
188191
);
189192
OTHER_LDFLAGS = "";
190193
PRODUCT_NAME = sqlcipher;
@@ -198,17 +201,15 @@
198201
COMBINE_HIDPI_IMAGES = YES;
199202
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
200203
GCC_MODEL_TUNING = G5;
201-
HEADER_SEARCH_PATHS = (
202-
"$(PROJECT_DIR)",
203-
"$(OPENSSL_SRC)/include",
204-
);
204+
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
205205
INSTALL_PATH = /usr/local/lib;
206206
OTHER_CFLAGS = (
207207
"-DSQLITE_HAS_CODEC",
208208
"-DNDEBUG",
209209
"-DSQLITE_OS_UNIX=1",
210210
"-DSQLITE_TEMP_STORE=2",
211211
"-DSQLITE_THREADSAFE",
212+
"-DSQLCIPHER_CRYPTO_CC",
212213
);
213214
"OTHER_CFLAGS[arch=armv6]" = (
214215
"-mno-thumb",
@@ -217,6 +218,7 @@
217218
"-DSQLITE_OS_UNIX=1",
218219
"-DSQLITE_TEMP_STORE=2",
219220
"-DSQLITE_THREADSAFE",
221+
"-DSQLCIPHER_CRYPTO_CC",
220222
);
221223
OTHER_LDFLAGS = "";
222224
PRODUCT_NAME = sqlcipher;
@@ -226,10 +228,7 @@
226228
1DEB91F008733DB70010E9CD /* Debug */ = {
227229
isa = XCBuildConfiguration;
228230
buildSettings = {
229-
"ARCHS[sdk=iphoneos*]" = (
230-
armv7s,
231-
armv7,
232-
);
231+
"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)";
233232
"ARCHS[sdk=macosx*]" = (
234233
x86_64,
235234
i386,
@@ -239,7 +238,7 @@
239238
GCC_WARN_ABOUT_RETURN_TYPE = YES;
240239
GCC_WARN_UNUSED_VARIABLE = YES;
241240
ONLY_ACTIVE_ARCH = YES;
242-
SDKROOT = "$(PLATFORM_NAME)";
241+
SDKROOT = iphoneos;
243242
SKIP_INSTALL = YES;
244243
SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos";
245244
};
@@ -253,14 +252,11 @@
253252
armv7s,
254253
armv7,
255254
);
256-
"ARCHS[sdk=macosx*]" = (
257-
x86_64,
258-
i386,
259-
);
255+
"ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD)";
260256
GCC_C_LANGUAGE_STANDARD = c99;
261257
GCC_WARN_ABOUT_RETURN_TYPE = YES;
262258
GCC_WARN_UNUSED_VARIABLE = YES;
263-
SDKROOT = "$(PLATFORM_NAME)";
259+
SDKROOT = iphoneos;
264260
SKIP_INSTALL = YES;
265261
SUPPORTED_PLATFORMS = "iphonesimulator macosx iphoneos";
266262
};

0 commit comments

Comments
 (0)