dnrops
/
node-oracledb
mirror of https://github.com/oracle/node-oracledb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added submodule for the ODPI-C repository code and adjusted binding.gyp to make use of it

This commit is contained in:
Christopher Jones 2017-06-14 08:49:32 +10:00
parent 1f627a52e3
commit 2a1ae1225d
3 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "odpi"]
path = odpi
url = https://github.com/oracle/odpi

50
binding.gyp
View File

@ -11,19 +11,18 @@
"src/njs/src/njsMessages.cpp",
"src/njs/src/njsIntLob.cpp"
],
"include_dirs" : [ "src/dpic/include",
"<!(node -e \"require('nan')\")"
],
"libraries" : ['-ldpi'],
"conditions" : [
[
'OS=="linux"', {
"variables" : {
"dpi_inc_dir%" : "$(DPI_INC_DIR)",
"dpi_lib_dir%" : "$(DPI_LIB_DIR)",
},
"cflags" : ['-fexceptions'],
"cflags_cc" : ['-fexceptions'],
"libraries" : ["-ldpi"],
"link_settings" : {
"libraries" : ['-L<(dpi_lib_dir)']
}
"libraries" : [ '-L $(srcdir)/src/dpic/src' ]
},
}
],
[
@ -32,52 +31,36 @@
"GCC_ENABLE_CPP_EXCEPTIONS": "YES",
"GCC_ENABLE_CPP_RTTI": "YES"
},
"variables" : {
"dpi_inc_dir%" : "$(DPI_INC_DIR)",
"dpi_lib_dir%" : "$(DPI_LIB_DIR)",
},
"cflags" : ['-fexceptions'],
"cflags_cc" : ['-fexceptions'],
"libraries" : ["-ldpi"],
"link_settings" : {
"libraries" : ['-L<(dpi_lib_dir)']
"cflags" : ['-fexceptions'],
"cflags_cc" : ['-fexceptions'],
"libraries" : ["-ldpi"],
"link_settings" : {
"libraries" : ['-L $(srcdir)/src/dpic/src']
}
}
],
[
'OS=="aix"', {
"variables" : {
"dpi_inc_dir%" : "$(DPI_INC_DIR)",
"dpi_lib_dir%" : "$(DPI_LIB_DIR)",
},
"libraries" : ["-ldpi"],
"cflags" : ['-fexceptions'],
"cflags_cc" : ['-fexceptions'],
"link_settings" : {
"libraries" : ['-L<(dpi_lib_dir)']
"libraries" : ['-L $(srcdir)/src/dpic/src']
}
}
],
[
'OS=="solaris"', {
"variables" : {
"dpi_inc_dir%" : "$(DPI_INC_DIR)",
"dpi_lib_dir%" : "$(DPI_LIB_DIR)",
},
"libraries" : ["-ldpi"],
"cflags" : ['-fexceptions'],
"cflags_cc" : ['-fexceptions'],
"link_settings" : {
"libraries" : ['-L<(dpi_lib_dir)']
"libraries" : ['-L $(srcdir)/src/dpic/src']
}
}
],
[
"OS=='win'", {
"variables" : {
"dpi_inc_dir%" : "$(DPI_INC_DIR)",
"dpi_lib_dir%" : "$(DPI_LIB_DIR)",
},
"link_settings": {
"libraries": [
"-ldpi",
@ -115,7 +98,7 @@
"EnableCOMDATFolding": 2,
"LinkIncremental": 1,
"AdditionalLibraryDirectories": [
"<(dpi_lib_dir)"
"$(srcdir)/src/dpic/src"
]
}
}
@ -140,7 +123,7 @@
"LinkTimeCodeGeneration": 1,
"LinkIncremental": 1,
"AdditionalLibraryDirectories": [
"<(dpi_lib_dir)"
"$(srcdir)/src/dpic/src"
]
}
}
@ -149,9 +132,6 @@
}
],
],
"include_dirs" : [ "<(dpi_inc_dir)",
"<!(node -e \"require('nan')\")"
],
}
]
}

1
odpi Submodule

@ -0,0 +1 @@
Subproject commit 897122c6568e3cb5872187fbb21215993d9bcc76