Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #7

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
update
ideawu committed Jul 31, 2018
commit 037506f8a352cd9ce963ef279ab51b2584003aa5
10 changes: 4 additions & 6 deletions src/Makefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
include ../build_config.mk

CFLAGS += -I .
OBJS = event.o parser.o session.o transport.o server.o
OBJS =
LIBS = util/libutil.a net/libnet.a line/libline.a core/libcore.a

all: ${OBJS}
make clean
$(CXX) ${CFLAGS} test.cpp ${OBJS} ${LIBS}

.cpp.o:
$(CXX) ${CFLAGS} -c $< -o $@

test:
make clean
make
$(CXX) ${CFLAGS} test.cpp ${OBJS} util/libutil.a net/libnet.a line/libline.a

clean:
rm -rf *.o *.a *.out

19 changes: 19 additions & 0 deletions src/core/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
include ../../build_config.mk

CFLAGS += -I ../
OBJS = event.o parser.o session.o transport.o server.o

all: ${OBJS}
ar -cru ./libcore.a ${OBJS}

.cpp.o:
$(CXX) ${CFLAGS} -c $< -o $@

test:
make clean
make
$(CXX) ${CFLAGS} test.cpp ${OBJS} util/libutil.a net/libnet.a line/libline.a

clean:
rm -rf *.o *.a *.out

2 changes: 1 addition & 1 deletion src/line/line_message.h
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
#define SIM_LINE_MESSAGE_H

#include <string>
#include "message.h"
#include "core/message.h"
#include "util/buffer.h"

class LineMessage : public Message
6 changes: 3 additions & 3 deletions src/line/line_parser.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifndef SIM_LINE_PARSER_H
#define SIM_LINE_PARSER_H

#include "parser.h"
#include "message.h"
#include "session.h"
#include "core/parser.h"
#include "core/message.h"
#include "core/session.h"
#include "util/buffer.h"

class LineParser : public Parser
4 changes: 2 additions & 2 deletions src/line/line_server.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef SIM_LINE_SERVER_H
#define SIM_LINE_SERVER_H

#include "server.h"
#include "session.h"
#include "core/server.h"
#include "core/session.h"

class LineServer : public Server
{
2 changes: 1 addition & 1 deletion src/test.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "transport.h"
#include "util/log.h"
#include "core/transport.h"
#include "line/line_message.h"
#include "line/line_server.h"