8000 Fixed build related issues with included files and umbrella header. · g-coder/sqlcipher@f4595d3 · GitHub
[go: up one dir, main page]
Skip to content

Commit f4595d3

Browse files
cnooncnoon
committed
Fixed build related issues with included files and umbrella header.
Resolved the following: - Added sqlite3.h to the project to be copied in framework bundle - Added sqlite3.c to all the framework targets to be compiled - Added sqlite3.h to umbrella header - Added clang warning suppression to compile without warnings
1 parent 09b03f1 commit f4595d3

File tree

2 files changed

+86
-0
lines changed

2 files changed

+86
-0
lines changed

‎macosx/SQLCipher.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33

44
FOUNDATION_EXPORT double SQLCipherVersionNumber;
55
FOUNDATION_EXPORT const unsigned char SQLCipherVersionString[];
6+
7+
#import "sqlite3.h"

‎sqlcipher.xcodeproj/project.pbxproj

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@
2929
4C0041CF1BFC3D4000ED2AD5 /* SQLCipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041A91BFC3A7E00ED2AD5 /* SQLCipher.h */; settings = {ATTRIBUTES = (Public, ); }; };
3030
4C0041E11BFC3F0800ED2AD5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C0041E01BFC3F0800ED2AD5 /* Security.framework */; };
3131
4C0041E21BFC3F5A00ED2AD5 /* SQLCipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041A91BFC3A7E00ED2AD5 /* SQLCipher.h */; settings = {ATTRIBUTES = (Public, ); }; };
32+
4C0041FA1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
33+
4C0041FB1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
34+
4C0041FC1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
35+
4C0041FD1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
36+
4C0041FE1BFC474700ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; };
37+
4C0041FF1BFC474700ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; };
38+
4C0042001BFC474700ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; };
39+
4C0042011BFC474800ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; };
3240
9069D0A30FCE1A4D0042E34C /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; };
3341
/* End PBXBuildFile section */
3442

@@ -82,6 +90,7 @@
8290
4C0041D01BFC3D9A00ED2AD5 /* Info-tvOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-tvOS.plist"; path = "macosx/Info-tvOS.plist"; sourceTree = "<group>"; };
8391
4C0041D61BFC3E2500ED2AD5 /* SQLCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8492
4C0041E01BFC3F0800ED2AD5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.0.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
93+
4C0041F91BFC46A600ED2AD5 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqlite3.h; sourceTree = "<group>"; };
8594
9069D0A20FCE1A4D0042E34C /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqlite3.c; sourceTree = "<group>"; };
8695
D2AAC046055464E500DB518D /* libsqlcipher.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsqlcipher.a; sourceTree = BUILT_PRODUCTS_DIR; };
8796
/* End PBXFileReference section */
@@ -144,6 +153,7 @@
144153
isa = PBXGroup;
145154
children = (
146155
9069D0A20FCE1A4D0042E34C /* sqlite3.c */,
156+
4C0041F91BFC46A600ED2AD5 /* sqlite3.h */,
147157
);
148158
name = Source;
149159
sourceTree = "<group>";
@@ -188,6 +198,7 @@
188198
isa = PBXHeadersBuildPhase;
189199
buildActionMask = 2147483647;
190200
files = (
201+
4C0041FA1BFC46A600ED2AD5 /* sqlite3.h in Headers */,
191202
4C0041AB1BFC3A7E00ED2AD5 /* SQLCipher.h in Headers */,
192203
);
193204
runOnlyForDeploymentPostprocessing = 0;
@@ -196,6 +207,7 @@
196207
isa = PBXHeadersBuildPhase;
197208
buildActionMask = 2147483647;
198209
files = (
210+
4C0041FB1BFC46A600ED2AD5 /* sqlite3.h in Headers */,
199211
4C0041BD1BFC3C8300ED2AD5 /* SQLCipher.h in Headers */,
200212
);
201213
runOnlyForDeploymentPostprocessing = 0;
@@ -204,6 +216,7 @@
204216
isa = PBXHeadersBuildPhase;
205217
buildActionMask = 2147483647;
206218
files = (
219+
4C0041FC1BFC46A600ED2AD5 /* sqlite3.h in Headers */,
207220
4C0041CF1BFC3D4000ED2AD5 /* SQLCipher.h in Headers */,
208221
);
209222
runOnlyForDeploymentPostprocessing = 0;
@@ -212,6 +225,7 @@
212225
isa = PBXHeadersBuildPhase;
213226
buildActionMask = 2147483647;
214227
files = (
228+
4C0041FD1BFC46A600ED2AD5 /* sqlite3.h in Headers */,
215229
4C0041E21BFC3F5A00ED2AD5 /* SQLCipher.h in Headers */,
216230
);
217231
runOnlyForDeploymentPostprocessing = 0;
@@ -419,27 +433,31 @@
419433
isa = PBXSourcesBuildPhase;
420434
buildActionMask = 2147483647;
421435
files = (
436+
4C0041FE1BFC474700ED2AD5 /* sqlite3.c in Sources */,
422437
);
423438
runOnlyForDeploymentPostprocessing = 0;
424439
};
425440
4C0041AC1BFC3B2200ED2AD5 /* Sources */ = {
426441
isa = PBXSourcesBuildPhase;
427442
buildActionMask = 2147483647;
428443
files = (
444+
4C0041FF1BFC474700ED2AD5 /* sqlite3.c in Sources */,
429445
);
430446
runOnlyForDeploymentPostprocessing = 0;
431447
};
432448
4C0041BE1BFC3CC000ED2AD5 /* Sources */ = {
433449
isa = PBXSourcesBuildPhase;
434450
buildActionMask = 2147483647;
435451
files = (
452+
4C0042001BFC474700ED2AD5 /* sqlite3.c in Sources */,
436453
);
437454
runOnlyForDeploymentPostprocessing = 0;
438455
};
439456
4C0041D11BFC3E2500ED2AD5 /* Sources */ = {
440457
isa = PBXSourcesBuildPhase;
441458
buildActionMask = 2147483647;
442459
files = (
460+
4C0042011BFC474800ED2AD5 /* sqlite3.c in Sources */,
443461
);
444462
runOnlyForDeploymentPostprocessing = 0;
445463
};
@@ -638,10 +656,17 @@
638656
"$(inherited)",
639657
);
640658
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
659+
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
660+
GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
641661
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
662+
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
663+
GCC_WARN_MISSING_PARENTHESES = YES;
664+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
642665
GCC_WARN_UNDECLARED_SELECTOR = YES;
643666
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
644667
GCC_WARN_UNUSED_FUNCTION = YES;
668+
GCC_WARN_UNUSED_VALUE = YES;
669+
GCC_WARN_UNUSED_VARIABLE = YES;
645670
INFOPLIST_FILE = macosx/Info.plist;
646671
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
647672
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -653,6 +678,12 @@
653678
"-DSQLITE_TEMP_STORE=2",
654679
"-DSQLITE_THREADSAFE",
655680
"-DSQLCIPHER_CRYPTO_CC",
681+
"-Wno-ambiguous-macro",
682+
"-Wno-#warnings",
683+
"-Wno-conversion",
684+
"-Wno-unused-const-variable",
685+
"-Wno-unused-function",
686+
"-Wno-unreachable-code",
656687
);
657688
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
658689
PRODUCT_NAME = SQLCipher;
@@ -703,10 +734,17 @@
703734
GCC_C_LANGUAGE_STANDARD = gnu99;
704735
GCC_NO_COMMON_BLOCKS = YES;
705736
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
737+
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
738+
GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
706739
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
740+
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
741+
GCC_WARN_MISSING_PARENTHESES = YES;
742+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
707743
GCC_WARN_UNDECLARED_SELECTOR = YES;
708744
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
709745
GCC_WARN_UNUSED_FUNCTION = YES;
746+
GCC_WARN_UNUSED_VALUE = YES;
747+
GCC_WARN_UNUSED_VARIABLE = YES;
710748
INFOPLIST_FILE = macosx/Info.plist;
711749
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
712750
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -718,6 +756,12 @@
718756
"-DSQLITE_TEMP_STORE=2",
719757
"-DSQLITE_THREADSAFE",
720758
"-DSQLCIPHER_CRYPTO_CC",
759+
"-Wno-ambiguous-macro",
760+
"-Wno-#warnings",
761+
"-Wno-conversion",
762+
"-Wno-unused-const-variable",
763+
"-Wno-unused-function",
764+
"-Wno-unreachable-code",
721765
);
722766
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
723767
PRODUCT_NAME = SQLCipher;
@@ -788,6 +832,12 @@
788832
"-DSQLITE_TEMP_STORE=2",
789833
"-DSQLITE_THREADSAFE",
790834
"-DSQLCIPHER_CRYPTO_CC",
835+
"-Wno-ambiguous-macro",
836+
"-Wno-#warnings",
837+
"-Wno-conversion",
838+
"-Wno-unused-const-variable",
839+
"-Wno-unused-function",
840+
"-Wno-unreachable-code",
791841
);
792842
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
793843
PRODUCT_NAME = SQLCipher;
@@ -854,6 +904,12 @@
854904
"-DSQLITE_TEMP_STORE=2",
855905
"-DSQLITE_THREADSAFE",
856906
"-DSQLCIPHER_CRYPTO_CC",
907+
"-Wno-ambiguous-macro",
908+
"-Wno-#warnings",
909+
"-Wno-conversion",
910+
"-Wno-unused-const-variable",
911+
"-Wno-unused-function",
912+
"-Wno-unreachable-code",
857913
);
858914
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
859915
PRODUCT_NAME = SQLCipher;
@@ -920,6 +976,12 @@
920976
"-DSQLITE_TEMP_STORE=2",
921977
"-DSQLITE_THREADSAFE",
922978
"-DSQLCIPHER_CRYPTO_CC",
979+
"-Wno-ambiguous-macro",
980+
"-Wno-#warnings",
981+
"-Wno-conversion",
982+
"-Wno-unused-const-variable",
983+
"-Wno-unused-function",
984+
"-Wno-unreachable-code",
923985
);
924986
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
925987
PRODUCT_NAME = SQLCipher;
@@ -984,6 +1046,12 @@
9841046
"-DSQLITE_TEMP_STORE=2",
9851047
"-DSQLITE_THREADSAFE",
9861048
"-DSQLCIPHER_CRYPTO_CC",
1049+
"-Wno-ambiguous-macro",
1050+
"-Wno-#warnings",
1051+
"-Wno-conversion",
1052+
"-Wno-unused-const-variable",
1053+
"-Wno-unused-function",
1054+
"-Wno-unreachable-code",
9871055
);
9881056
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
9891057
PRODUCT_NAME = SQLCipher;
@@ -1053,6 +1121,12 @@
10531121
"-DSQLITE_TEMP_STORE=2",
10541122
"-DSQLITE_THREADSAFE",
10551123
"-DSQLCIPHER_CRYPTO_CC",
1124+
"-Wno-ambiguous-macro",
1125+
"-Wno-#warnings",
1126+
"-Wno-conversion",
1127+
"-Wno-unused-const-variable",
1128+
"-Wno-unused-function",
1129+
"-Wno-unreachable-code",
10561130
);
10571131
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
10581132
PRODUCT_NAME = SQLCipher;
@@ -1118,6 +1192,12 @@
11181192
"-DSQLITE_TEMP_STORE=2",
11191193
"-DSQLITE_THREADSAFE",
11201194
"-DSQLCIPHER_CRYPTO_CC",
1195+
"-Wno-ambiguous-macro",
1196+
"-Wno-#warnings",
1197+
"-Wno-conversion",
1198+
"-Wno-unused-const-variable",
1199+
"-Wno-unused-function",
1200+
"-Wno-unreachable-code",
11211201
);
11221202
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
11231203
PRODUCT_NAME = SQLCipher;
@@ -1188,6 +1268,7 @@
11881268
4C00419F1BFC382500ED2AD5 /* Release */,
11891269
);
11901270
defaultConfigurationIsVisible = 0;
1271+
defaultConfigurationName = Release;
11911272
};
11921273
4C0041B61BFC3B2200ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher OSX" */ = {
11931274
isa = XCConfigurationList;
@@ -1196,6 +1277,7 @@
11961277
4C0041B81BFC3B2200ED2AD5 /* Release */,
11971278
);
11981279
defaultConfigurationIsVisible = 0;
1280+
defaultConfigurationName = Release;
11991281
};
12001282
4C0041C81BFC3CC000ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher tvOS" */ = {
12011283
isa = XCConfigurationList;
@@ -1204,6 +1286,7 @@
12041286
4C0041CA1BFC3CC000ED2AD5 /* Release */,
12051287
);
12061288
defaultConfigurationIsVisible = 0;
1289+
defaultConfigurationName = Release;
12071290
};
12081291
4C0041DB1BFC3E2600ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher watchOS" */ = {
12091292
isa = XCConfigurationList;
@@ -1212,6 +1295,7 @@
12121295
4C0041DD1BFC3E2600ED2AD5 /* Release */,
12131296
);
12141297
defaultConfigurationIsVisible = 0;
1298+
defaultConfigurationName = Release;
12151299
};
12161300
9069D0900FCE18970042E34C /* Build configuration list for PBXAggregateTarget "amalgamation" */ = {
12171301
isa = XCConfigurationList;

0 commit comments

Comments
 (0)
0