From 69c0222b9eb95f8d3e0b9d55e4f685994940b8f9 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Wed, 25 Dec 2013 07:49:42 +0100 Subject: Adding jsoncpp to the build. --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 22935f0..3b10442 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ CPPFLAGS += -g3 -gdwarf-2 -DDEBUG -DEV_VERIFY=3 LDFLAGS += -g3 -gdwarf-2 endif -INCLUDES = includes libcoro libev LuaJIT/src lcrypt libtommath libtomcrypt/src/headers +INCLUDES = includes libcoro libev LuaJIT/src lcrypt libtommath libtomcrypt/src/headers src/jsoncpp/include LIBS = z DEFINES = _LARGEFILE64_SOURCE LITTLE_ENDIAN LTM_DESC LTC_SOURCE USE_LTM @@ -28,6 +28,7 @@ CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) $(addprefix -D, $(DEFINES)) LDFLAGS += $(ARCH_FLAGS) LDLIBS = $(addprefix -l, $(LIBS)) +vpath %.cpp src/jsoncpp/src vpath %.cc src:tests vpath %.c libcoro:libev:win32/pthreads-win32:win32/iconv:win32/regex:lcrypt @@ -65,6 +66,10 @@ HttpServer.cc \ SimpleMustache.cc \ BWebSocket.cc \ \ +json_reader.cpp \ +json_writer.cpp \ +json_value.cpp \ +\ SHA1.cc \ Base64.cc \ \ @@ -176,6 +181,9 @@ dep: $(ALL_DEPS) %.dep : %.cc $(CXX) $(CXXFLAGS) $(CPPFLAGS_NO_ARCH) -M $< > $@ +%.dep : %.cpp + $(CXX) $(CXXFLAGS) $(CPPFLAGS_NO_ARCH) -M $< > $@ + %.dep : %.c $(CC) $(CFLAGS) $(CPPFLAGS_NO_ARCH) -M $< > $@ -- cgit v1.2.3