Skip to content

Commit 3b4767a

Browse files
Merge pull request #4 from Siperb/0.0.11
Yml file new added
2 parents 31e6123 + f6f3e3a commit 3b4767a

7 files changed

Lines changed: 775 additions & 264 deletions

File tree

.github/workflows/build.yml

Lines changed: 760 additions & 0 deletions
Large diffs are not rendered by default.

.github/workflows/build.yml.disabled

Lines changed: 0 additions & 251 deletions
This file was deleted.

.github/workflows/node-addon-build.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.0.9
1+
0.0.11

binding.gyp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
],
99
"include_dirs": [
1010
"<!@(node -p \"require('node-addon-api').include\")",
11-
"pjproject-2.15.1/pjproject-2.15.1/pjlib/include",
12-
"pjproject-2.15.1/pjproject-2.15.1/pjlib-util/include",
13-
"pjproject-2.15.1/pjproject-2.15.1/pjmedia/include",
14-
"pjproject-2.15.1/pjproject-2.15.1/pjnath/include",
15-
"pjproject-2.15.1/pjproject-2.15.1/pjsip/include"
11+
"pjproject-2.15.1/pjlib/include",
12+
"pjproject-2.15.1/pjlib-util/include",
13+
"pjproject-2.15.1/pjmedia/include",
14+
"pjproject-2.15.1/pjnath/include",
15+
"pjproject-2.15.1/pjsip/include",
16+
"pjproject-2.15.1/pjsip-apps/src/pjsua"
1617
],
1718
"conditions": [
1819
["OS=='win'", {
@@ -25,21 +26,23 @@
2526
"msvcrt.lib",
2627
"kernel32.lib",
2728
"user32.lib",
28-
"C:/Users/admin/OneDrive/Desktop/Bhavdeep/pjsipoldcheckfunc/node-pjsip/pjproject-2.15.1/pjproject-2.15.1/lib/libpjproject-x86_64-x64-vc14-Release.lib"
29+
"<!(node -e \"const fs=require('fs'); const path=require('path'); const rootDir='pjproject-2.15.1'; const searchPaths=['lib','pjlib/lib','pjlib-util/lib','pjmedia/lib','pjnath/lib','pjsip/lib','third_party/lib']; const foundLibs=[]; searchPaths.forEach(sp=>{const fullPath=path.join(rootDir,sp); if(fs.existsSync(fullPath)){fs.readdirSync(fullPath).filter(f=>f.endsWith('.lib')).forEach(lib=>foundLibs.push(path.resolve(fullPath,lib)))}}); if(foundLibs.length===0){process.stderr.write('No PJSIP libraries found'); process.exit(1)}; const ordered=['pjsua2-lib','pjsua-lib','pjsip-ua','pjsip-simple','pjsip-core','pjmedia-codec','pjmedia-audiodev','pjmedia-videodev','pjmedia','pjnath','pjlib-util','pjlib','libspeex','libilbccodec','libg7221codec','libgsmcodec','libsrtp','libresample','libwebrtc','libyuv','libbaseclasses','libmilenage']; const orderedLibs=[]; ordered.forEach(name=>{const lib=foundLibs.find(l=>l.includes(name)); if(lib)orderedLibs.push(lib)}); foundLibs.forEach(lib=>{if(!orderedLibs.includes(lib))orderedLibs.push(lib)}); console.log(orderedLibs.join(';'));\")"
2930
],
3031
"msvs_settings": {
3132
"VCCLCompilerTool": {
3233
"ExceptionHandling": 1,
3334
"AdditionalOptions": ["/std:c++17"]
3435
},
3536
"VCLinkerTool": {
36-
"AdditionalOptions": ["/NODEFAULTLIB:MSVCRT"]
37+
"AdditionalOptions": ["/NODEFAULTLIB:MSVCRT"],
38+
"AdditionalDependencies": ["Delayimp.lib"],
39+
"DelayLoadDLLs": ["node.exe"]
3740
}
3841
}
3942
}],
4043
["OS=='mac'", {
4144
"libraries": [
42-
"C:/Users/admin/OneDrive/Desktop/Bhavdeep/pjsipoldcheckfunc/node-pjsip/pjproject-2.15.1/pjproject-2.15.1/lib/libpjproject-x86_64-x64-vc14-Release.lib"
45+
"<!(node -e \"const fs=require('fs'); const path=require('path'); const libDir = 'pjproject-2.15.1/lib'; const foundLibs = []; if(fs.existsSync(libDir)) { const libFiles = fs.readdirSync(libDir).filter(f => f.endsWith('.a') || f.endsWith('.dylib')); libFiles.forEach(lib => { foundLibs.push(path.resolve(libDir, lib)); }); } else { console.log('lib directory not found: ' + libDir); } if(foundLibs.length === 0) { console.log('No PJSIP libraries found in ' + libDir); process.exit(1); } foundLibs.forEach(lib => console.log(lib));\")"
4346
],
4447
"xcode_settings": {
4548
"MACOSX_DEPLOYMENT_TARGET": "15.0",

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
"types": "dist/index.d.ts",
77
"scripts": {
88
"build": "npm run build:native && npm run build:js",
9-
"build:native": "node-gyp rebuild",
9+
"build:native": "node-gyp rebuild --arch=x64",
1010
"build:js": "tsc",
1111
"test": "node dist/test.js",
1212
"example": "node dist/example.js",
1313
"clean": "rimraf build dist",
14-
"prebuild": "npm run clean && mkdir -p build",
15-
"configure": "node-gyp configure",
14+
"prebuild": "npm run clean && node -e \"require('fs').mkdirSync('build',{recursive:true})\"",
15+
"configure": "node-gyp configure --arch=x64",
1616
"install": "npm run build",
1717
"start": "node dist/test.js"
1818
},

pjproject-2.14.zip

-11.8 MB
Binary file not shown.

0 commit comments

Comments
 (0)