From 96413dc6f2ac695aff7113e76afe040411dfbded Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Thu, 15 May 2014 23:05:31 -0400 Subject: [PATCH] maybe this will work for travis --- .travis.yml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0d66f22..74df18d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,4 +13,4 @@ install: - export CC=gcc-4.8 - export CXX=g++-4.8 - cd capnproto-c++-0.4.1 && ./configure && make -j5 && sudo make install && cd .. -script: make CXX=g++-4.8 +script: make CXX=g++-4.8 CXX_FLAGS="std=c++11 -I/usr/local/include -L/usr/local/lib -lcapnp -lkj" diff --git a/Makefile b/Makefile index e1dba9e..375d713 100644 --- a/Makefile +++ b/Makefile @@ -12,10 +12,10 @@ clean : sbt clean capnpc-java : $(CAPNPC_JAVA_SOURCES) - $(CXX) $(CXX_FLAGS) -g $(CAPNPC_JAVA_SOURCES) -o capnpc-java + $(CXX) $(CAPNPC_JAVA_SOURCES) $(CXX_FLAGS) -g -o capnpc-java addressbook : capnpc-java PWD=pwd - mkdir examples/src/main/generated + mkdir -p examples/src/main/generated capnp compile -I$(PWD)/generator/src/main/cpp/compiler --src-prefix=examples/src/main/schema -o./capnpc-java:examples/src/main/generated examples/src/main/schema/addressbook.capnp sbt examples/"compile"