added r3 as a submodule

This commit is contained in:
Dominik Tomičević 2015-09-25 22:50:57 +02:00
parent a778a72dce
commit b8fa8fd904
4 changed files with 8 additions and 4 deletions

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "cypher/lexertl"]
path = cypher/lexertl
url = https://github.com/BenHanson/lexertl.git
[submodule "speedy/r3"]
path = speedy/r3
url = https://github.com/c9s/r3.git

View File

@ -1,6 +1,6 @@
CXX=clang++
CFLAGS=-std=c++11 -Wall
LDFLAGS=-luv -lhttp_parser -lr3
LDFLAGS=-luv -lhttp_parser ./r3/.libs/libr3.a /usr/lib/x86_64-linux-gnu/libpcre.a
# debug only
INC=-I../ -g -O0 -fno-inline-functions
SOURCES=$(wildcard *.cpp)
@ -10,7 +10,7 @@ EXECUTABLE=test.out
all: $(EXECUTABLE)
$(EXECUTABLE): $(SOURCES)
$(CXX) $(LDFLAGS) $(SOURCES) -o $(EXECUTABLE) $(CFLAGS) $(INC)
$(CXX) $(CFLAGS) $(SOURCES) -o $(EXECUTABLE) $(INC) $(LDFLAGS)
# .cpp.o:
# $(CXX) $(CFLAGS) $< -o $@ $(LDFLAGS) $(INC)

1
speedy/r3 Submodule

@ -0,0 +1 @@
Subproject commit eb2ff77e5cfe62b4df68c5f11f8a3c9393b11b50

View File

@ -12,8 +12,8 @@
#include <string.h>
#include <pcre.h>
#include <stdbool.h>
#include <r3/str_array.h>
#include <r3/r3_str.h>
#include "r3/include/str_array.h"
#include "r3/include/r3_str.h"
#ifdef __cplusplus
extern "C" {