Skip to content

Commit 042ba38

Browse files
authored
Merge pull request #26 from Bilb/fix-thread-safety-log
fix: make logging thread safe
2 parents 4e95c55 + 0196c21 commit 042ba38

21 files changed

+106
-57
lines changed

.vscode/c_cpp_properties.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"configurations": [
3+
{
4+
"name": "Linux",
5+
"includePath": [
6+
"${workspaceFolder}/**",
7+
"${workspaceFolder}/include/**",
8+
"${workspaceFolder}/libsession-util/include/**",
9+
"${workspaceFolder}/node_modules/node-addon-api/",
10+
"${workspaceFolder}/node_modules/node-api-headers/include/"
11+
],
12+
"defines": [],
13+
"compilerPath": "/usr/bin/clang",
14+
"cStandard": "c17",
15+
"cppStandard": "c++20",
16+
"intelliSenseMode": "linux-clang-x64"
17+
},
18+
{
19+
"name": "Mac",
20+
"includePath": [
21+
"${workspaceFolder}/**",
22+
"${workspaceFolder}/include/**",
23+
"${workspaceFolder}/libsession-util/include/**",
24+
"${workspaceFolder}/node_modules/node-addon-api/",
25+
"${workspaceFolder}/node_modules/node-api-headers/include/"
26+
],
27+
"defines": [],
28+
"compilerPath": "/usr/bin/clang",
29+
"cStandard": "c17",
30+
"cppStandard": "c++20",
31+
"intelliSenseMode": "macos-clang-arm64"
32+
}
33+
],
34+
"version": 4
35+
}

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if(MSVC)
4848
endif()
4949

5050
add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_JS_SRC})
51-
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_JS_INC} "node_modules/node-addon-api" "../../node_modules/node-addon-api" "node_modules/node-api-headers/include" "../../node_modules/node-api-headers/include")
51+
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_JS_INC} "include/" "node_modules/node-addon-api" "../../node_modules/node-addon-api" "node_modules/node-api-headers/include" "../../node_modules/node-api-headers/include")
5252

5353
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
5454
target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_JS_LIB} ${LIBSESSION_STATIC_BUNDLE_LIBS})
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)