diff options
| author |   Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2014-08-26 18:05:10 +0300 |
|---|---|---|
| committer | Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2014-08-26 18:05:10 +0300 |
| commit | 8a95311b51e6b64835ba8141594d8e804241377e (patch) | |
| tree | ef08360c0f56ae61fe95702699f82fab0624f6f7 | |
| parent | 3ed219382e55885a66a462db1cf06170ce80e606 (diff) | |
Add pb_common.c to examples
| -rw-r--r-- | examples/simple/Makefile | 1 | ||||
| -rw-r--r-- | extra/FindNanopb.cmake | 4 | ||||
| -rw-r--r-- | extra/nanopb.mk | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/examples/simple/Makefile b/examples/simple/Makefile index 02a4c3ff..970a8650 100644 --- a/examples/simple/Makefile +++ b/examples/simple/Makefile @@ -10,6 +10,7 @@ CSRC = simple.c # The main program CSRC += simple.pb.c # The compiled protocol definition CSRC += $(NANOPB_DIR)/pb_encode.c # The nanopb encoder CSRC += $(NANOPB_DIR)/pb_decode.c # The nanopb decoder +CSRC += $(NANOPB_DIR)/pb_common.c # The nanopb common parts # Build rule for the main program simple: $(CSRC) diff --git a/extra/FindNanopb.cmake b/extra/FindNanopb.cmake index c804e701..65ab5884 100644 --- a/extra/FindNanopb.cmake +++ b/extra/FindNanopb.cmake @@ -182,8 +182,8 @@ mark_as_advanced(NANOPB_INCLUDE_DIRS) # Find nanopb source files set(NANOPB_SRCS) set(NANOPB_HDRS) -list(APPEND _nanopb_srcs pb_decode.c pb_encode.c) -list(APPEND _nanopb_hdrs pb_decode.h pb_encode.h pb.h) +list(APPEND _nanopb_srcs pb_decode.c pb_encode.c pb_common.c) +list(APPEND _nanopb_hdrs pb_decode.h pb_encode.h pb_common.h pb.h) foreach(FIL ${_nanopb_srcs}) find_file(${FIL}__nano_pb_file NAMES ${FIL} PATHS ${NANOPB_SRC_ROOT_FOLDER} ${NANOPB_INCLUDE_DIRS}) diff --git a/extra/nanopb.mk b/extra/nanopb.mk index 7576baee..5c2cff56 100644 --- a/extra/nanopb.mk +++ b/extra/nanopb.mk @@ -5,7 +5,7 @@ NANOPB_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../) # Files for the nanopb core -NANOPB_CORE = $(NANOPB_DIR)/pb_encode.c $(NANOPB_DIR)/pb_decode.c +NANOPB_CORE = $(NANOPB_DIR)/pb_encode.c $(NANOPB_DIR)/pb_decode.c $(NANOPB_DIR)/pb_common.c # Check if we are running on Windows ifdef windir |