diff --git a/ClientCore/CMakeLists.txt b/ClientCore/CMakeLists.txt index f9976ea..603e040 100644 --- a/ClientCore/CMakeLists.txt +++ b/ClientCore/CMakeLists.txt @@ -12,5 +12,5 @@ ClientCore.cxx ) add_library(ClientCore STATIC ${MSOURCES}) -target_link_libraries(ClientCore PRIVATE wx::base wx::core Protocol Util) +target_link_libraries(ClientCore PRIVATE wx::base wx::core wx::net Protocol Util) target_include_directories(ClientCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file diff --git a/Protocol/Communicate.cxx b/Protocol/Communicate.cxx index 22c76d0..6c857ab 100644 --- a/Protocol/Communicate.cxx +++ b/Protocol/Communicate.cxx @@ -1,4 +1,5 @@ #include "Communicate.h" +#include constexpr unsigned char gHeader[] = {0xFF, 0xFE}; constexpr unsigned char gTail[] = {0xFF, 0xFF}; diff --git a/UserInterface/HeaderControl.h b/UserInterface/HeaderControl.h index 324fa24..0d9ca8a 100644 --- a/UserInterface/HeaderControl.h +++ b/UserInterface/HeaderControl.h @@ -2,6 +2,7 @@ #define HEADERCONTROL_H #include +#include class LogControl; class ClientCore; diff --git a/UserInterface/main.cxx b/UserInterface/main.cxx index ec3bb0f..aa272b5 100644 --- a/UserInterface/main.cxx +++ b/UserInterface/main.cxx @@ -6,7 +6,9 @@ class RelayFileApp : public wxApp public: bool OnInit() override { +#ifdef _WIN32 SetProcessDPIAware(); +#endif loadLocale(); f_ = new UserInterface(_("RelayFile")); f_->Show(); diff --git a/Util/Util.h b/Util/Util.h index 1c97379..5050b87 100644 --- a/Util/Util.h +++ b/Util/Util.h @@ -18,7 +18,8 @@ class MLogFormatter : public wxLogFormatter public: wxString Format(wxLogLevel level, const wxString& msg, const wxLogRecordInfo& info) const override { - wxDateTime time(info.timestampMS / 1000); + //wxDateTime time(info.timestampMS / 1000); + wxDateTime time; time.SetMillisecond(info.timestampMS % 1000); auto timeStr = time.Format(wxT("%H:%M:%S.%l")); wxString levelStr;