diff options
| author | Josh Haberman <haberman@google.com> | 2013-05-25 10:26:59 -0700 |
|---|---|---|
| committer | Josh Haberman <haberman@google.com> | 2013-05-25 10:26:59 -0700 |
| commit | 90bb4246c34580eb6c8a5a41a4e19fcd5f334f09 (patch) | |
| tree | c0a5fedd4633dcaf1e975adc2edb34332a5dd686 /Makefile | |
| parent | cfdb9907cb87d15eaab72ceefbfa42fd7a4c3127 (diff) | |
Synced with Google-internal development.
C++ handlers are now type-safe; SinkFrame is gone.
Various other changes.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -49,7 +49,7 @@ CXX=g++ CFLAGS=-std=gnu99 CXXFLAGS=-Ibindings/cpp INCLUDE=-Itests -I. -CPPFLAGS=$(INCLUDE) -Wall -Wextra $(USER_CFLAGS) +CPPFLAGS=$(INCLUDE) -Wall -Wextra -Wno-sign-compare $(USER_CFLAGS) LDLIBS=-lpthread upb/libupb.a LUA=lua5.1 # 5.1 and 5.2 should both be supported @@ -82,7 +82,7 @@ deps: Makefile $(ALLSRC) # The core library. CORE= \ - upb/bytestream.c \ + upb/bytestream.upb.c \ upb/def.c \ upb/descriptor/reader.c \ upb/descriptor/descriptor.upb.c \ @@ -90,6 +90,7 @@ CORE= \ upb/google/proto2.cc \ upb/handlers.c \ upb/refcounted.c \ + upb/shim/shim.c \ upb/sink.c \ upb/symtab.c \ upb/table.c \ |