4 files changed, 30 insertions, 1 deletions
diff --git a/tests/regression/issue_203/SConscript b/tests/regression/issue_203/SConscript
new file mode 100644
index 00000000..8b4d6cc7
--- /dev/null
+++ b/tests/regression/issue_203/SConscript
@@ -0,0 +1,9 @@
+# Regression test for issue with multiple files generated at once
+
+Import('env')
+
+env.Command(['file1.pb.c', 'file1.pb.h', 'file2.pb.c', 'file2.pb.h'], ['file1.proto', 'file2.proto'],
+            env['NANOPB_PROTO_CMD'])
+
+env.Object('file1.pb.c')
+env.Object('file2.pb.c')
diff --git a/tests/regression/issue_203/file1.proto b/tests/regression/issue_203/file1.proto
new file mode 100644
index 00000000..dae250b8
--- /dev/null
+++ b/tests/regression/issue_203/file1.proto
@@ -0,0 +1,10 @@
+syntax = "proto2";
+
+message SubMessage1 {
+	required int32 foo = 1;
+}
+
+message Message1 {
+	required SubMessage1 bar = 1;
+}
+
diff --git a/tests/regression/issue_203/file2.proto b/tests/regression/issue_203/file2.proto
new file mode 100644
index 00000000..513b0f0d
--- /dev/null
+++ b/tests/regression/issue_203/file2.proto
@@ -0,0 +1,10 @@
+syntax = "proto2";
+
+message SubMessage2 {
+	required int32 foo = 1;
+}
+
+message Message2 {
+	required SubMessage2 bar = 1;
+}
+
diff --git a/tests/site_scons/site_tools/nanopb.py b/tests/site_scons/site_tools/nanopb.py
index b3e58fa1..c72a45d3 100644
--- a/tests/site_scons/site_tools/nanopb.py
+++ b/tests/site_scons/site_tools/nanopb.py
@@ -118,7 +118,7 @@ def generate(env):
     
     env.SetDefault(PROTOCPATH = ['.', os.path.join(env['NANOPB'], 'generator', 'proto')])
     
-    env.SetDefault(NANOPB_PROTO_CMD = '$PROTOC $PROTOC_OPTS --nanopb_out=. $SOURCE')
+    env.SetDefault(NANOPB_PROTO_CMD = '$PROTOC $PROTOCFLAGS --nanopb_out=. $SOURCES')
     env['BUILDERS']['NanopbProto'] = _nanopb_proto_builder
     
 def exists(env):