Try building without prebuilt OpenSSL
This commit is contained in:
parent
4f66ee7b85
commit
e1f73c0738
16
deps/common.gypi
vendored
16
deps/common.gypi
vendored
@ -12,22 +12,6 @@
|
||||
'ExceptionHandling': 1,
|
||||
},
|
||||
},
|
||||
'conditions': [
|
||||
['OS == "win"', {
|
||||
'defines': ['WIN32'],
|
||||
'conditions': [
|
||||
['target_arch == "ia32"', {
|
||||
'variables': {
|
||||
'openssl_root%': 'OpenSSL-Win32',
|
||||
}
|
||||
}, {
|
||||
'variables': {
|
||||
'openssl_root%': 'OpenSSL-Win64',
|
||||
}
|
||||
}]
|
||||
],
|
||||
}],
|
||||
],
|
||||
'configurations': {
|
||||
'Debug': {
|
||||
'defines!': [
|
||||
|
||||
59
deps/sqlite3.gyp
vendored
59
deps/sqlite3.gyp
vendored
@ -20,50 +20,22 @@
|
||||
'<(SHARED_INTERMEDIATE_DIR)/sqlite3/sqlite3.h',
|
||||
'<(SHARED_INTERMEDIATE_DIR)/sqlite3/sqlite3ext.h',
|
||||
],
|
||||
'conditions': [
|
||||
['OS == "win"', {
|
||||
'outputs': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)/sqlite3/>(openssl_root)/libssl.lib',
|
||||
'<(SHARED_INTERMEDIATE_DIR)/sqlite3/>(openssl_root)/libcrypto.lib',
|
||||
'<(SHARED_INTERMEDIATE_DIR)/sqlite3/>(openssl_root)/ossl_static.pdb',
|
||||
],
|
||||
}],
|
||||
],
|
||||
'action': ['node', 'extract.js', '<(SHARED_INTERMEDIATE_DIR)/sqlite3'],
|
||||
}],
|
||||
},
|
||||
{
|
||||
'target_name': 'copy_dll',
|
||||
'type': 'none',
|
||||
'dependencies': ['locate_sqlite3'],
|
||||
'conditions': [
|
||||
['OS == "win"', {
|
||||
'copies': [{
|
||||
'files': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)/sqlite3/>(openssl_root)/libssl.lib',
|
||||
'<(SHARED_INTERMEDIATE_DIR)/sqlite3/>(openssl_root)/libcrypto.lib',
|
||||
'<(SHARED_INTERMEDIATE_DIR)/sqlite3/>(openssl_root)/ossl_static.pdb',
|
||||
],
|
||||
'destination': '<(PRODUCT_DIR)',
|
||||
}],
|
||||
}],
|
||||
],
|
||||
},
|
||||
{
|
||||
'target_name': 'sqlite3',
|
||||
'type': 'static_library',
|
||||
'dependencies': ['locate_sqlite3', 'copy_dll'],
|
||||
'sources': ['<(SHARED_INTERMEDIATE_DIR)/sqlite3/sqlite3.c'],
|
||||
'include_dirs': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)/sqlite3/',
|
||||
'<(SHARED_INTERMEDIATE_DIR)/sqlite3/openssl-include',
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)/sqlite3/',
|
||||
'<(SHARED_INTERMEDIATE_DIR)/sqlite3/openssl-include',
|
||||
],
|
||||
},
|
||||
'dependencies': ['locate_sqlite3'],
|
||||
'sources': ['<(SHARED_INTERMEDIATE_DIR)/sqlite3/sqlite3.c'],
|
||||
'cflags': ['-std=c99', '-w'],
|
||||
'xcode_settings': {
|
||||
'OTHER_CFLAGS': ['-std=c99'],
|
||||
@ -75,33 +47,6 @@
|
||||
'defines': [
|
||||
'WIN32'
|
||||
],
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
'-llibcrypto.lib',
|
||||
'-llibssl.lib',
|
||||
'-lws2_32.lib',
|
||||
'-lcrypt32.lib'
|
||||
],
|
||||
'library_dirs': [
|
||||
'<(SHARED_INTERMEDIATE_DIR)/sqlite3/>(openssl_root)'
|
||||
]
|
||||
}
|
||||
},
|
||||
'OS == "mac"', {
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
# This statically links libcrypto, whereas -lcrypto would dynamically link it
|
||||
'<(SHARED_INTERMEDIATE_DIR)/sqlite3/OpenSSL-macOS/libcrypto.a'
|
||||
]
|
||||
}
|
||||
},
|
||||
{ # Linux
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
# This statically links libcrypto, whereas -lcrypto would dynamically link it
|
||||
'<(SHARED_INTERMEDIATE_DIR)/sqlite3/OpenSSL-Linux/libcrypto.a'
|
||||
]
|
||||
}
|
||||
}],
|
||||
],
|
||||
'configurations': {
|
||||
|
||||
BIN
deps/sqlite3.tar.gz
(Stored with Git LFS)
vendored
BIN
deps/sqlite3.tar.gz
(Stored with Git LFS)
vendored
Binary file not shown.
Loading…
Reference in New Issue
Block a user