Skip to content

Commit

Permalink
Fixed build related issues with included files and umbrella header.
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@cnoon
cnoon committed Nov 18, 2015
1 parent 09b03f1 commit f4595d3
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 0 deletions.
2 changes: 2 additions & 0 deletions macosx/SQLCipher.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@

FOUNDATION_EXPORT double SQLCipherVersionNumber;
FOUNDATION_EXPORT const unsigned char SQLCipherVersionString[];

#import "sqlite3.h"
84 changes: 84 additions & 0 deletions sqlcipher.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@
4C0041CF1BFC3D4000ED2AD5 /* SQLCipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041A91BFC3A7E00ED2AD5 /* SQLCipher.h */; settings = {ATTRIBUTES = (Public, ); }; };
4C0041E11BFC3F0800ED2AD5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C0041E01BFC3F0800ED2AD5 /* Security.framework */; };
4C0041E21BFC3F5A00ED2AD5 /* SQLCipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041A91BFC3A7E00ED2AD5 /* SQLCipher.h */; settings = {ATTRIBUTES = (Public, ); }; };
4C0041FA1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
4C0041FB1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
4C0041FC1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
4C0041FD1BFC46A600ED2AD5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0041F91BFC46A600ED2AD5 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
4C0041FE1BFC474700ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; };
4C0041FF1BFC474700ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; };
4C0042001BFC474700ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; };
4C0042011BFC474800ED2AD5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; };
9069D0A30FCE1A4D0042E34C /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 9069D0A20FCE1A4D0042E34C /* sqlite3.c */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -82,6 +90,7 @@
4C0041D01BFC3D9A00ED2AD5 /* Info-tvOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-tvOS.plist"; path = "macosx/Info-tvOS.plist"; sourceTree = "<group>"; };
4C0041D61BFC3E2500ED2AD5 /* SQLCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; };
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; };
4C0041F91BFC46A600ED2AD5 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqlite3.h; sourceTree = "<group>"; };
9069D0A20FCE1A4D0042E34C /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqlite3.c; sourceTree = "<group>"; };
D2AAC046055464E500DB518D /* libsqlcipher.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsqlcipher.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -144,6 +153,7 @@
isa = PBXGroup;
children = (
9069D0A20FCE1A4D0042E34C /* sqlite3.c */,
4C0041F91BFC46A600ED2AD5 /* sqlite3.h */,
);
name = Source;
sourceTree = "<group>";
Expand Down Expand Up @@ -188,6 +198,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
4C0041FA1BFC46A600ED2AD5 /* sqlite3.h in Headers */,
4C0041AB1BFC3A7E00ED2AD5 /* SQLCipher.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -196,6 +207,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
4C0041FB1BFC46A600ED2AD5 /* sqlite3.h in Headers */,
4C0041BD1BFC3C8300ED2AD5 /* SQLCipher.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -204,6 +216,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
4C0041FC1BFC46A600ED2AD5 /* sqlite3.h in Headers */,
4C0041CF1BFC3D4000ED2AD5 /* SQLCipher.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -212,6 +225,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
4C0041FD1BFC46A600ED2AD5 /* sqlite3.h in Headers */,
4C0041E21BFC3F5A00ED2AD5 /* SQLCipher.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -419,27 +433,31 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4C0041FE1BFC474700ED2AD5 /* sqlite3.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
4C0041AC1BFC3B2200ED2AD5 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4C0041FF1BFC474700ED2AD5 /* sqlite3.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
4C0041BE1BFC3CC000ED2AD5 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4C0042001BFC474700ED2AD5 /* sqlite3.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
4C0041D11BFC3E2500ED2AD5 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4C0042011BFC474800ED2AD5 /* sqlite3.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -638,10 +656,17 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
GCC_WARN_MISSING_PARENTHESES = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = macosx/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
Expand All @@ -653,6 +678,12 @@
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
"-DSQLCIPHER_CRYPTO_CC",
"-Wno-ambiguous-macro",
"-Wno-#warnings",
"-Wno-conversion",
"-Wno-unused-const-variable",
"-Wno-unused-function",
"-Wno-unreachable-code",
);
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
PRODUCT_NAME = SQLCipher;
Expand Down Expand Up @@ -703,10 +734,17 @@
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
GCC_WARN_MISSING_PARENTHESES = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = macosx/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
Expand All @@ -718,6 +756,12 @@
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
"-DSQLCIPHER_CRYPTO_CC",
"-Wno-ambiguous-macro",
"-Wno-#warnings",
"-Wno-conversion",
"-Wno-unused-const-variable",
"-Wno-unused-function",
"-Wno-unreachable-code",
);
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
PRODUCT_NAME = SQLCipher;
Expand Down Expand Up @@ -788,6 +832,12 @@
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
"-DSQLCIPHER_CRYPTO_CC",
"-Wno-ambiguous-macro",
"-Wno-#warnings",
"-Wno-conversion",
"-Wno-unused-const-variable",
"-Wno-unused-function",
"-Wno-unreachable-code",
);
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
PRODUCT_NAME = SQLCipher;
Expand Down Expand Up @@ -854,6 +904,12 @@
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
"-DSQLCIPHER_CRYPTO_CC",
"-Wno-ambiguous-macro",
"-Wno-#warnings",
"-Wno-conversion",
"-Wno-unused-const-variable",
"-Wno-unused-function",
"-Wno-unreachable-code",
);
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
PRODUCT_NAME = SQLCipher;
Expand Down Expand Up @@ -920,6 +976,12 @@
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
"-DSQLCIPHER_CRYPTO_CC",
"-Wno-ambiguous-macro",
"-Wno-#warnings",
"-Wno-conversion",
"-Wno-unused-const-variable",
"-Wno-unused-function",
"-Wno-unreachable-code",
);
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
PRODUCT_NAME = SQLCipher;
Expand Down Expand Up @@ -984,6 +1046,12 @@
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
"-DSQLCIPHER_CRYPTO_CC",
"-Wno-ambiguous-macro",
"-Wno-#warnings",
"-Wno-conversion",
"-Wno-unused-const-variable",
"-Wno-unused-function",
"-Wno-unreachable-code",
);
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
PRODUCT_NAME = SQLCipher;
Expand Down Expand Up @@ -1053,6 +1121,12 @@
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
"-DSQLCIPHER_CRYPTO_CC",
"-Wno-ambiguous-macro",
"-Wno-#warnings",
"-Wno-conversion",
"-Wno-unused-const-variable",
"-Wno-unused-function",
"-Wno-unreachable-code",
);
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
PRODUCT_NAME = SQLCipher;
Expand Down Expand Up @@ -1118,6 +1192,12 @@
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
"-DSQLCIPHER_CRYPTO_CC",
"-Wno-ambiguous-macro",
"-Wno-#warnings",
"-Wno-conversion",
"-Wno-unused-const-variable",
"-Wno-unused-function",
"-Wno-unreachable-code",
);
PRODUCT_BUNDLE_IDENTIFIER = net.zetetic.SQLCipher;
PRODUCT_NAME = SQLCipher;
Expand Down Expand Up @@ -1188,6 +1268,7 @@
4C00419F1BFC382500ED2AD5 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
4C0041B61BFC3B2200ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher OSX" */ = {
isa = XCConfigurationList;
Expand All @@ -1196,6 +1277,7 @@
4C0041B81BFC3B2200ED2AD5 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
4C0041C81BFC3CC000ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher tvOS" */ = {
isa = XCConfigurationList;
Expand All @@ -1204,6 +1286,7 @@
4C0041CA1BFC3CC000ED2AD5 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
4C0041DB1BFC3E2600ED2AD5 /* Build configuration list for PBXNativeTarget "SQLCipher watchOS" */ = {
isa = XCConfigurationList;
Expand All @@ -1212,6 +1295,7 @@
4C0041DD1BFC3E2600ED2AD5 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
9069D0900FCE18970042E34C /* Build configuration list for PBXAggregateTarget "amalgamation" */ = {
isa = XCConfigurationList;
Expand Down

0 comments on commit f4595d3

Please sign in to comment.