From 53d25e8ae83e8dc6a06331987b088957edd276f8 Mon Sep 17 00:00:00 2001 From: Dmitriy Date: Mon, 15 Jul 2024 23:26:05 +0700 Subject: [PATCH] Linux Support --- CMakeLists.txt | 26 ++++++++++---------------- README.md | 4 ++-- thirdparty/libwebview | 2 +- thirdparty/simdjson | 2 +- 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 08a4aad..1024c82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,18 +32,6 @@ add_executable(Notes src/note_storage.cpp src/note.cpp) -if(WIN32) -set_target_properties(Notes - PROPERTIES - LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE" - LINK_FLAGS_RELEASE "/SUBSYSTEM:windows /ENTRY:mainCRTStartup" - LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:windows /ENTRY:mainCRTStartup" - LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:windows /ENTRY:mainCRTStartup" - ) - -target_sources(Notes PRIVATE app.rc) -endif() - target_include_directories(Notes PRIVATE ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/include) @@ -54,12 +42,18 @@ target_link_libraries(Notes PRIVATE base64pp SQLiteCpp simdjson - libwebview_edge) + libwebview) if(WIN32) -target_link_libraries(Notes PRIVATE libwebview_edge) -elseif(UNIX) -target_link_libraries(Notes PRIVATE libwebview_webkit) +set_target_properties(Notes + PROPERTIES + LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE" + LINK_FLAGS_RELEASE "/SUBSYSTEM:windows /ENTRY:mainCRTStartup" + LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:windows /ENTRY:mainCRTStartup" + LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:windows /ENTRY:mainCRTStartup" + ) + +target_sources(Notes PRIVATE app.rc) endif() add_custom_command( diff --git a/README.md b/README.md index 1308542..180a7a4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## Notes +# Notes Minimalistic note editor in Markdown format. @@ -12,7 +12,7 @@ Download all dependencies (thirdparty) using --recursive git. ### Requirements -- Visual Studio 2022 or Clang-18 +- Visual Studio /or Build Tools 2022 or Clang 18 - CMake 3.25.1+ ## Thirdparties diff --git a/thirdparty/libwebview b/thirdparty/libwebview index f30c6cf..dec552c 160000 --- a/thirdparty/libwebview +++ b/thirdparty/libwebview @@ -1 +1 @@ -Subproject commit f30c6cfd858ab645dc07b393fc31a829d576badf +Subproject commit dec552cce41387373f8f5e82a3031598b4af036d diff --git a/thirdparty/simdjson b/thirdparty/simdjson index ee85151..5090247 160000 --- a/thirdparty/simdjson +++ b/thirdparty/simdjson @@ -1 +1 @@ -Subproject commit ee8515122d6b7973522afce7131e57062a4ad30b +Subproject commit 5090247c34770760fc0c16f69c25d3f1fcbab240