From c138d364e8a2bae1a64e649ee1664321614c94e9 Mon Sep 17 00:00:00 2001 From: Shawn Presser Date: Thu, 14 Jun 2018 11:55:22 -0500 Subject: [PATCH 1/3] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 084be38a..3ad8cedb 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,8 @@ ipch/ *.sdf *.cachefile win.vs2015/LabSound.VC.* +labsound/win.vs2017/.vs +labsound/win.vs2017/PredictedInputCache*.dat # Visual Studio profiler *.psess From e6c75c94efbc6e51ba4b7936a9cbbc4e17388e90 Mon Sep 17 00:00:00 2001 From: Shawn Presser Date: Thu, 14 Jun 2018 11:56:46 -0500 Subject: [PATCH 2/3] Add build-windows-debug.cmd; tweak Debug settings --- labsound/build-windows-debug.cmd | 1 + labsound/win.vs2017/LabSound.vcxproj | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 labsound/build-windows-debug.cmd diff --git a/labsound/build-windows-debug.cmd b/labsound/build-windows-debug.cmd new file mode 100644 index 00000000..1fe712ae --- /dev/null +++ b/labsound/build-windows-debug.cmd @@ -0,0 +1 @@ +msbuild .\win.vs2017\LabSound.sln /p:Configuration=Debug /p:Platform=x64 /t:Clean,Build diff --git a/labsound/win.vs2017/LabSound.vcxproj b/labsound/win.vs2017/LabSound.vcxproj index bf7cfe4b..f1dc3771 100644 --- a/labsound/win.vs2017/LabSound.vcxproj +++ b/labsound/win.vs2017/LabSound.vcxproj @@ -961,10 +961,10 @@ Disabled $(ProjectDir)..\include;$(ProjectDir)..\src;$(ProjectDir)..\third_party;$(ProjectDir)..\third_party\STK;$(ProjectDir)..\..\node_modules\native-video-deps\include;%(AdditionalIncludeDirectories) - DEBUG;_ITERATOR_DEBUG_LEVEL=0;STATICALLY_LINKED_WITH_WTF;WIN32;D_VARIADIC_MAX=10;D_NOMINMAX;NOMINMAX;WTF_USE_WEBAUDIO_KISSFFT=1;__WINDOWS_WASAPI__;HAVE_NO_OFLOG;HAVE_BOOST_THREAD;HAVE_LIBDL;HAVE_ALLOCA;HAVE_UNISTD_H;__OS_WINDOWS__;__LITTLE_ENDIAN__;%(PreprocessorDefinitions) + DEBUG;STATICALLY_LINKED_WITH_WTF;WIN32;D_VARIADIC_MAX=10;D_NOMINMAX;NOMINMAX;WTF_USE_WEBAUDIO_KISSFFT=1;__WINDOWS_WASAPI__;HAVE_NO_OFLOG;HAVE_BOOST_THREAD;HAVE_LIBDL;HAVE_ALLOCA;HAVE_UNISTD_H;__OS_WINDOWS__;__LITTLE_ENDIAN__;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL true @@ -995,9 +995,9 @@ Disabled $(ProjectDir)..\include;$(ProjectDir)..\src;$(ProjectDir)..\third_party;$(ProjectDir)..\third_party\STK;$(ProjectDir)..\..\node_modules\native-video-deps\include;%(AdditionalIncludeDirectories) - DEBUG;_ITERATOR_DEBUG_LEVEL=0;STATICALLY_LINKED_WITH_WTF;WIN32;D_VARIADIC_MAX=10;D_NOMINMAX;NOMINMAX;WTF_USE_WEBAUDIO_KISSFFT=1;__WINDOWS_WASAPI__;HAVE_NO_OFLOG;HAVE_BOOST_THREAD;HAVE_LIBDL;HAVE_ALLOCA;HAVE_UNISTD_H;__OS_WINDOWS__;__LITTLE_ENDIAN__;%(PreprocessorDefinitions) + DEBUG;STATICALLY_LINKED_WITH_WTF;WIN32;D_VARIADIC_MAX=10;D_NOMINMAX;NOMINMAX;WTF_USE_WEBAUDIO_KISSFFT=1;__WINDOWS_WASAPI__;HAVE_NO_OFLOG;HAVE_BOOST_THREAD;HAVE_LIBDL;HAVE_ALLOCA;HAVE_UNISTD_H;__OS_WINDOWS__;__LITTLE_ENDIAN__;%(PreprocessorDefinitions) EnableFastChecks - MultiThreaded + MultiThreadedDebugDLL true @@ -1102,4 +1102,4 @@ - \ No newline at end of file + From 51f6f49ccd6b67097fb09c6d3e336cf115877da6 Mon Sep 17 00:00:00 2001 From: Shawn Presser Date: Thu, 14 Jun 2018 12:23:46 -0500 Subject: [PATCH 3/3] Set up a working debug configuration --- binding.gyp | 70 +++++++++++++++++++++++++++++++++++------------------ index.js | 4 +-- 2 files changed, 48 insertions(+), 26 deletions(-) diff --git a/binding.gyp b/binding.gyp index 0183b7a1..ea7cb919 100644 --- a/binding.gyp +++ b/binding.gyp @@ -35,32 +35,54 @@ '-Wl,-Bsymbolic', ], }], - ['OS=="win"', { - 'library_dirs': [ - '<(module_root_dir)/labsound/build/x64/Release', + ['OS=="win"', { + 'configurations': { + 'Debug': { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'RuntimeLibrary': '3' # /MDd + }, + }, + 'library_dirs': [ + '<(module_root_dir)/labsound/build/x64/Debug', "