diff --git a/CMakeLists.txt b/CMakeLists.txt index 65ec6735..511a7379 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,11 +10,10 @@ endif () include(CheckCCompilerFlag) -check_c_compiler_flag(-mssse3 HAS_SSSE3) check_c_compiler_flag(-msse4.1 HAS_SSE4_1) -if (HAS_SSSE3 AND HAS_SSE4_1) - add_compile_options(-mssse3 -msse4.1) +if (HAS_SSE4_1) + add_compile_options(-msse3 -msse4.1) endif () if(${CMAKE_BUILD_TYPE} MATCHES Debug) diff --git a/src/frontend/CMakeLists.txt b/src/frontend/CMakeLists.txt index 6e52d999..0442d064 100644 --- a/src/frontend/CMakeLists.txt +++ b/src/frontend/CMakeLists.txt @@ -30,7 +30,6 @@ include_directories( ../../external/nativefiledialog-extended/src/include ../../external/imgui/imgui ../../external/imgui/imgui/backends - ../../external/discord-rpc/include ../../external/unarr ) @@ -38,7 +37,6 @@ option(RAPIDJSON_BUILD_DOC "Build rapidjson documentation." OFF) option(RAPIDJSON_BUILD_EXAMPLES "Build rapidjson examples." OFF) option(RAPIDJSON_BUILD_TESTS "Build rapidjson perftests and unittests." OFF) -add_subdirectory(../../external/discord-rpc discord-rpc) add_subdirectory(../../external/json json) add_subdirectory(../../external/fmt fmt) add_subdirectory(../../external/mio mio) @@ -63,8 +61,7 @@ add_executable(kaizen-qt MainWindow.hpp MainWindow.cpp) -target_link_libraries(kaizen-qt PUBLIC Qt6::Core Qt6::Gui Qt6::Widgets fmt mio json - discord-rpc nfd parallel-rdp backend) +target_link_libraries(kaizen-qt PUBLIC Qt6::Core Qt6::Gui Qt6::Widgets fmt mio nlohmann_json nfd parallel-rdp backend) file(COPY ../../resources/ DESTINATION ${PROJECT_BINARY_DIR}/resources/) file(REMOVE