From 49c772a3df9ac56cf3fe52373cbf243eb8bef31e Mon Sep 17 00:00:00 2001 From: ap Date: Fri, 6 Jan 2017 21:11:31 -0800 Subject: [PATCH 1/4] Ignore build directories --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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* From 989612ba3f61e226253cee09baedb17833cf2a2f Mon Sep 17 00:00:00 2001 From: ap Date: Fri, 6 Jan 2017 21:11:50 -0800 Subject: [PATCH 2/4] Add swgchat- prefix to verbose log filenames --- extras/logger.cfg.dist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/logger.cfg.dist b/extras/logger.cfg.dist index aff5f62..c45da37 100644 --- a/extras/logger.cfg.dist +++ b/extras/logger.cfg.dist @@ -11,8 +11,8 @@ FILENAME = "var/log/swgchat.log" * WARNING: FILENAME = "var/log/swgchat.log" -* INFO:546 +* 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 From d597f8374f4eb3bc522053385d00393260af4855 Mon Sep 17 00:00:00 2001 From: ap Date: Fri, 6 Jan 2017 21:11:59 -0800 Subject: [PATCH 3/4] Disable the default log file --- src/stationchat/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From 39a770725f3101e50ab40796b6cae11c896aa32d Mon Sep 17 00:00:00 2001 From: ap Date: Fri, 6 Jan 2017 21:40:19 -0800 Subject: [PATCH 4/4] Use generator expression for compiler specifc linking --- src/stationchat/CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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)