diff --git a/binding.gyp b/binding.gyp index f21c7df48..d43331bac 100644 --- a/binding.gyp +++ b/binding.gyp @@ -30,7 +30,7 @@ ['OS=="win"', { 'targets': [ { - 'target_name': 'conpty', + 'target_name': 'conpty_backend', 'sources' : [ 'src/win/conpty.cc', 'src/win/path_util.cc' diff --git a/scripts/post-install.js b/scripts/post-install.js index d192504f0..6504f367c 100644 --- a/scripts/post-install.js +++ b/scripts/post-install.js @@ -7,8 +7,8 @@ const path = require('path'); const RELEASE_DIR = path.join(__dirname, '../build/Release'); const BUILD_FILES = [ - path.join(RELEASE_DIR, 'conpty.node'), - path.join(RELEASE_DIR, 'conpty.pdb'), + path.join(RELEASE_DIR, 'conpty_backend.node'), + path.join(RELEASE_DIR, 'conpty_backend.pdb'), path.join(RELEASE_DIR, 'conpty_console_list.node'), path.join(RELEASE_DIR, 'conpty_console_list.pdb'), path.join(RELEASE_DIR, 'pty.node'), diff --git a/src/win/conpty.cc b/src/win/conpty.cc index 83a185fdc..63fc70626 100644 --- a/src/win/conpty.cc +++ b/src/win/conpty.cc @@ -168,7 +168,7 @@ HANDLE LoadConptyDll(const Napi::CallbackInfo& info, return LoadLibraryExW(L"kernel32.dll", 0, 0); } wchar_t currentDir[MAX_PATH]; - HMODULE hModule = GetModuleHandleA("conpty.node"); + HMODULE hModule = GetModuleHandleA("conpty_backend.node"); if (hModule == NULL) { throw errorWithCode(info, "Failed to get conpty.node module handle"); } diff --git a/src/windowsPtyAgent.ts b/src/windowsPtyAgent.ts index ba5dbdbc9..0f3b8f130 100644 --- a/src/windowsPtyAgent.ts +++ b/src/windowsPtyAgent.ts @@ -63,10 +63,10 @@ export class WindowsPtyAgent { if (this._useConpty) { if (!conptyNative) { try { - conptyNative = require('../build/Release/conpty.node'); + conptyNative = require('../build/Release/conpty_backend.node'); } catch (outerError) { try { - conptyNative = require('../build/Debug/conpty.node'); + conptyNative = require('../build/Debug/conpty_backend.node'); } catch (innerError) { console.error('innerError', innerError); // Re-throw the exception from the Release require if the Debug require fails as well