From 71b3fbbfad4076bed859bb72e5473c815f671bdb Mon Sep 17 00:00:00 2001 From: Tony Rice Date: Sun, 14 May 2017 11:14:45 -0500 Subject: [PATCH 1/3] NodeJSUtils.cmake: adding missing libraries to the build --- cmake/NodeJsUtils.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/NodeJsUtils.cmake b/cmake/NodeJsUtils.cmake index b53ed3da8..9bedcbe0c 100644 --- a/cmake/NodeJsUtils.cmake +++ b/cmake/NodeJsUtils.cmake @@ -18,15 +18,18 @@ function (get_njs_libs nodejs_dir config_name) ${njs_build_lib}/v8_base_1.lib ${njs_build_lib}/v8_base_2.lib ${njs_build_lib}/v8_base_3.lib + ${njs_build_lib}/v8_base_4.lib + ${njs_build_lib}/v8_base_5.lib + ${njs_build_lib}/v8_base_6.lib + ${njs_build_lib}/v8_base_7.lib + ${njs_build_lib}/v8_base_8.lib + ${njs_build_lib}/v8_base_9.lib ${njs_build_lib}/v8_libbase.lib ${njs_build_lib}/v8_libplatform.lib ${njs_build_lib}/v8_libsampler.lib ${njs_build_lib}/v8_nosnapshot.lib ${njs_build_lib}/v8_snapshot.lib - # nodejs/build/$Config - ${njs_build}/mksnapshot.lib - # nodejs/$Config/lib ${njs_extra_lib}/cares.lib ${njs_extra_lib}/gtest.lib @@ -41,9 +44,6 @@ function (get_njs_libs nodejs_dir config_name) ${njs_extra_lib}/openssl.lib ${njs_extra_lib}/zlib.lib - # nodejs/$Config - ${njs_extra}/cctest.lib - # additional windows libs, required by Node.js Dbghelp Shlwapi @@ -79,4 +79,4 @@ function (get_njs_libs nodejs_dir config_name) #} endif() #} -endfunction (get_njs_libs) +endfunction (get_njs_libs) \ No newline at end of file From 9677fdfe055a4479efbd70e0811484493ec877ab Mon Sep 17 00:00:00 2001 From: Tony Rice Date: Mon, 15 May 2017 21:14:40 -0500 Subject: [PATCH 2/3] NodeJSUtils.cmake: fixing weird indention caused by my commit --- cmake/NodeJsUtils.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/NodeJsUtils.cmake b/cmake/NodeJsUtils.cmake index 9bedcbe0c..e10571f57 100644 --- a/cmake/NodeJsUtils.cmake +++ b/cmake/NodeJsUtils.cmake @@ -20,10 +20,10 @@ function (get_njs_libs nodejs_dir config_name) ${njs_build_lib}/v8_base_3.lib ${njs_build_lib}/v8_base_4.lib ${njs_build_lib}/v8_base_5.lib - ${njs_build_lib}/v8_base_6.lib - ${njs_build_lib}/v8_base_7.lib - ${njs_build_lib}/v8_base_8.lib - ${njs_build_lib}/v8_base_9.lib + ${njs_build_lib}/v8_base_6.lib + ${njs_build_lib}/v8_base_7.lib + ${njs_build_lib}/v8_base_8.lib + ${njs_build_lib}/v8_base_9.lib ${njs_build_lib}/v8_libbase.lib ${njs_build_lib}/v8_libplatform.lib ${njs_build_lib}/v8_libsampler.lib From 0313a05685ac88579903f1a9dc6fe4b3e6562978 Mon Sep 17 00:00:00 2001 From: Tony Rice Date: Mon, 15 May 2017 21:53:33 -0500 Subject: [PATCH 3/3] CmakeLists.txt: removing usage of link_static_crt() - causing windows builds to fail --- CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6aeadc3c7..ba25fdbbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,11 +81,6 @@ if(J2V8_BUILD_ONLY_DEBUG_RELEASE) #} endif() -# link against the static MS C++ runtime libraries -if(MSVC) - link_static_crt() -endif() - # create the j2v8 library add_library(j2v8 SHARED ${src_files})