From f3dcc5364fcbb0849dc5d64be8e38104a4241cb8 Mon Sep 17 00:00:00 2001 From: R4SAS Date: Wed, 8 Jun 2022 22:57:37 +0300 Subject: [PATCH] [make] update Unix daemon source name Signed-off-by: R4SAS --- Makefile | 3 --- build/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5446b079..9f26302e 100644 --- a/Makefile +++ b/Makefile @@ -51,17 +51,14 @@ else endif ifneq (, $(findstring darwin, $(SYS))) - DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp ifeq ($(HOMEBREW),1) include Makefile.homebrew else include Makefile.osx endif else ifneq (, $(findstring linux, $(SYS))$(findstring gnu, $(SYS))) - DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp include Makefile.linux else ifneq (, $(findstring freebsd, $(SYS))$(findstring openbsd, $(SYS))) - DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp include Makefile.bsd else ifneq (, $(findstring mingw, $(SYS))$(findstring windows-gnu, $(SYS))$(findstring cygwin, $(SYS))) DAEMON_SRC += Win32/Win32App.cpp Win32/Win32Service.cpp Win32/Win32NetState.cpp diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index 2cd16217..36fde49b 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -148,7 +148,7 @@ endif() # compiler flags customization(by system) if(UNIX) - list(APPEND DAEMON_SRC "${DAEMON_SRC_DIR}/UnixDaemon.cpp") + list(APPEND DAEMON_SRC "${DAEMON_SRC_DIR}/DaemonUnix.cpp") if(NOT(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR APPLE)) # "'sleep_for' is not a member of 'std::this_thread'" in gcc 4.7/4.8 add_definitions("-D_GLIBCXX_USE_NANOSLEEP=1")