From: Maxim Mamontov Date: Sat, 10 Jan 2015 20:08:00 +0000 (+0200) Subject: Fixed compilation issues. X-Git-Tag: 2.409~220 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/e982ee10a3a88a2cb6f623a3f12b1b428df9879c?ds=sidebyside;hp=554a2f77f485f55c8c62ae9d854a2198b2c0f98f Fixed compilation issues. --- diff --git a/projects/stargazer/plugins/Makefile.in b/projects/stargazer/plugins/Makefile.in index dd1e124a..efb5d984 100644 --- a/projects/stargazer/plugins/Makefile.in +++ b/projects/stargazer/plugins/Makefile.in @@ -13,8 +13,8 @@ STGLIBS_PATHS = $(addprefix -L ../../../../../stglibs/,$(addsuffix .lib,$(STGLIB STGLIBS_LIBS = $(addprefix -lstg,$(STGLIBS)) -CXXFLAGS += -fPIC $(STGLIBS_INCS) -CFLAGS += -fPIC $(STGLIBS_INCS) +CXXFLAGS += -fPIC $(DEFS) $(SEARCH_DIRS) $(STGLIBS_INCS) +CFLAGS += -fPIC $(DEFS) $(SEARCH_DIRS) $(STGLIBS_INCS) ifneq ($(OS),darwin) LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg diff --git a/projects/stargazer/plugins/configuration/sgconfig/Makefile b/projects/stargazer/plugins/configuration/sgconfig/Makefile index 40a5c534..2e5c8c60 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/Makefile +++ b/projects/stargazer/plugins/configuration/sgconfig/Makefile @@ -15,7 +15,6 @@ SRCS = ./stgconfig.cpp \ ./parser_users.cpp \ ./parser_message.cpp \ ./parser_auth_by.cpp \ - ./parser_user_info.cpp \ ./parser_server_info.cpp LIBS += -lexpat \ diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp index d1d25026..567c537a 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp @@ -19,6 +19,7 @@ * Author : Maxim Mamontov */ +#include "configproto.h" #include "conn.h" @@ -27,7 +28,6 @@ #include "parser_tariffs.h" #include "parser_users.h" #include "parser_message.h" -#include "parser_user_info.h" #include "parser_auth_by.h" #include "stg/common.h" @@ -230,8 +230,6 @@ void CONFIGPROTO::RegisterParsers() SP::SEND_MESSAGE::FACTORY::Register(m_registry, *m_users); SP::AUTH_BY::FACTORY::Register(m_registry, *m_users); - - SP::USER_INFO::FACTORY::Register(m_registry, *m_users); } int CONFIGPROTO::MaxFD() const