Fix spaces in paths on Windows also

diff --git a/generator/protoc-gen-nanopb.bat b/generator/protoc-gen-nanopb.bat
index 3eed057..7624984 100644 (file)
--- a/generator/protoc-gen-nanopb.bat
+++ b/generator/protoc-gen-nanopb.bat
@@ -9,4 +9,4 @@
 :: --plugin= on the command line.
 
 set mydir=%~dp0
-python %mydir%\nanopb_generator.py --protoc-plugin
+python "%mydir%\nanopb_generator.py" --protoc-plugin

diff --git a/tests/site_scons/site_tools/nanopb.py b/tests/site_scons/site_tools/nanopb.py
index 9783766..9197e19 100644 (file)
--- a/tests/site_scons/site_tools/nanopb.py
+++ b/tests/site_scons/site_tools/nanopb.py
@@ -58,7 +58,7 @@ def _detect_protoc(env):
         return env['PROTOC']
     
     p = _detect_nanopb(env)
-    p1 = os.path.join(p, 'generator-bin', 'protoc')
+    p1 = os.path.join(p, 'generator-bin', 'protoc' + env['PROGSUFFIX'])
     if os.path.exists(p1):
         # Use protoc bundled with binary package
         return env['ESCAPE'](p1)