From 31936f6025c1a80ff1743dc5218fc674ee896ab8 Mon Sep 17 00:00:00 2001 From: R4SAS Date: Wed, 8 Jun 2022 23:00:21 +0300 Subject: [PATCH] [make] change daemon sources list, add unix/win32 depending on system Signed-off-by: R4SAS --- Makefile | 5 ++++- filelist.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9f26302e..c903a7ee 100644 --- a/Makefile +++ b/Makefile @@ -51,17 +51,20 @@ else endif ifneq (, $(findstring darwin, $(SYS))) + DAEMON_SRC += $(DAEMON_SRC_DIR)/DaemonUnix.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)/DaemonUnix.cpp include Makefile.linux else ifneq (, $(findstring freebsd, $(SYS))$(findstring openbsd, $(SYS))) + DAEMON_SRC += $(DAEMON_SRC_DIR)/DaemonUnix.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 + DAEMON_SRC += $(DAEMON_SRC_DIR)/DaemonWin32.cpp Win32/Win32App.cpp Win32/Win32Service.cpp Win32/Win32NetState.cpp include Makefile.mingw else # not supported $(error Not supported platform) diff --git a/filelist.mk b/filelist.mk index 1c7ae082..409f7254 100644 --- a/filelist.mk +++ b/filelist.mk @@ -4,4 +4,4 @@ LANG_SRC = $(wildcard $(LANG_SRC_DIR)/*.cpp) WEBCONSOLE_SRC = $(wildcard $(WEBCONSOLE_SRC_DIR)/*.cpp) WRAP_LIB_SRC = $(wildcard $(WRAP_SRC_DIR)/*.cpp) -DAEMON_SRC = $(wildcard $(DAEMON_SRC_DIR)/*.cpp) +DAEMON_SRC = $(DAEMON_SRC_DIR)/Daemon.cpp $(DAEMON_SRC_DIR)/I2PControl.cpp $(DAEMON_SRC_DIR)/i2pd.cpp $(DAEMON_SRC_DIR)/UPnP.cpp