Move the logic of load-balancing etc. into ServerPool, which frees external users...

[cubemap] / Makefile

diff --git a/Makefile b/Makefile
index c80ab9d537d5bee77f999c646997b2d733eb553f..2db0a754e6b5cd09a2f376cd1d85403edb34961f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,19 @@
 CC=gcc
 CXX=g++
 CC=gcc
 CXX=g++

+PROTOC=protoc

 CXXFLAGS=-Wall -O2 -g
 CXXFLAGS=-Wall -O2 -g

-LDLIBS=-lcurl
+LDLIBS=-lcurl -lpthread -lprotobuf

 
 

-OBJS=cubemap.o server.o mutexlock.o
+OBJS=cubemap.o server.o serverpool.o mutexlock.o input.o state.pb.o

 
 all: cubemap
 
 
 all: cubemap
 

-%.o: %.cpp
+%.pb.cc %.pb.h : %.proto
+       $(PROTOC) --cpp_out=. $<
+
+%.o: %.cpp state.pb.h
+       $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
+%.pb.o: %.pb.cc

        $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 cubemap: $(OBJS)
        $(CXX) -o cubemap $(OBJS) $(LDLIBS)
        $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 cubemap: $(OBJS)
        $(CXX) -o cubemap $(OBJS) $(LDLIBS)


@@ -16,5 +22,7 @@ DEPS=$(OBJS:.o=.d)
 -include $(DEPS)
 
 clean:
 -include $(DEPS)
 
 clean:

-       $(RM) cubemap $(OBJS) $(DEPS)
+       $(RM) cubemap $(OBJS) $(DEPS) state.pb.h state.pb.cc

 
 

+.PHONY: clean
+.SUFFIXES: