diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e23698..0884505 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -426,13 +426,14 @@ set_target_properties (ztcore PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${INTERMEDIATE_LIBRARY_OUTPUT_PATH}) # libzt.a -add_library (${STATIC_LIB_NAME} STATIC $ -$ -$ -$ -$ ${libztSrcGlob}) +add_library (${STATIC_LIB_NAME} STATIC $ +$ +$ +$ +$ ${libztSrcGlob}) set_target_properties (${STATIC_LIB_NAME} PROPERTIES OUTPUT_NAME zt + POSITION_INDEPENDENT_CODE ON LIBRARY_OUTPUT_DIRECTORY ${INTERMEDIATE_LIBRARY_OUTPUT_PATH}) set_target_properties (${STATIC_LIB_NAME} PROPERTIES COMPILE_FLAGS "${ZT_FLAGS}") if (BUILDING_WIN) diff --git a/examples/node/binding.gyp b/examples/node/binding.gyp index 5aa3e1d..a53ef2a 100644 --- a/examples/node/binding.gyp +++ b/examples/node/binding.gyp @@ -2,7 +2,6 @@ "targets": [ { "include_dirs": [ - "libzt/lib/release/linux-x86_64", "libzt/include", ], "includes": [ @@ -13,7 +12,7 @@ ], "conditions":[ ["OS=='linux' and target_arch=='x64'", { - "libraries": [ "<(module_root_dir)/libzt/lib/release/linux-x86_64/libzt.so" ] + "libraries": [ "<(module_root_dir)/libzt/lib/release/linux-x86_64/libzt.a" ] }], ["OS=='mac' and target_arch=='x64'", { "libraries": [ "<(module_root_dir)/libzt/lib/release/macos-x86_64/libzt.a" ]