diff --git a/.gitignore b/.gitignore index 3ac8df7..c0b397c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -externals/udplibrary \ No newline at end of file +externals/udplibrary +build* diff --git a/extras/logger.cfg.dist b/extras/logger.cfg.dist index 1db0352..c45da37 100644 --- a/extras/logger.cfg.dist +++ b/extras/logger.cfg.dist @@ -14,5 +14,5 @@ * INFO: FILENAME = "var/log/swgchat.log" * VERBOSE: - FILENAME = "var/log/verbose.%datetime{%Y%M%d_%H%m%s}.log" + FILENAME = "var/log/swgchat-verbose.%datetime{%Y%M%d_%H%m%s}.log" TO_STANDARD_OUTPUT = false diff --git a/src/stationchat/CMakeLists.txt b/src/stationchat/CMakeLists.txt index 1ccac1f..b2e335e 100644 --- a/src/stationchat/CMakeLists.txt +++ b/src/stationchat/CMakeLists.txt @@ -66,13 +66,10 @@ target_link_libraries(stationchat stationapi udplibrary ${Boost_LIBRARIES} - ${SQLite3_LIBRARY}) + ${SQLite3_LIBRARY} + $<$:ws2_32>) target_include_directories(stationchat PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -if(WIN32) - target_link_libraries(stationchat ws2_32) -endif() - install(TARGETS stationchat RUNTIME DESTINATION bin) diff --git a/src/stationchat/main.cpp b/src/stationchat/main.cpp index 62d8c40..0c147cf 100644 --- a/src/stationchat/main.cpp +++ b/src/stationchat/main.cpp @@ -1,7 +1,7 @@ #define ELPP_DISABLE_DEFAULT_CRASH_HANDLING 1 -#define ELPP_DEFAULT_LOG_FILE "logs/swgchat.log" +#define ELPP_NO_DEFAULT_LOG_FILE #include "easylogging++.h"