httpserver_makefile.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. diff --git a/Makefile b/Makefile
  2. index a03055b..c1f17d4 100644
  3. --- a/Makefile
  4. +++ b/Makefile
  5. @@ -3,13 +3,16 @@
  6. ######################################################################
  7. # Path to nodemcu-uploader (https://github.com/kmpm/nodemcu-uploader)
  8. -NODEMCU-UPLOADER=../nodemcu-uploader/nodemcu-uploader.py
  9. +NODEMCU-UPLOADER?=../nodemcu-uploader/nodemcu-uploader.py
  10. # Serial port
  11. -PORT=/dev/cu.SLAB_USBtoUART
  12. -SPEED=115200
  13. +PORT?=/dev/cu.SLAB_USBtoUART
  14. -NODEMCU-COMMAND=$(NODEMCU-UPLOADER) -b $(SPEED) --start_baud $(SPEED) -p $(PORT) upload
  15. +SPEED?=115200
  16. +
  17. +NODEMCU-COMMAND?=$(NODEMCU-UPLOADER) -b $(SPEED) --start_baud $(SPEED) -p $(PORT) upload
  18. +
  19. +PYTHON?=python3
  20. ######################################################################
  21. @@ -26,17 +29,17 @@ usage:
  22. # Upload one files only
  23. upload:
  24. - @python $(NODEMCU-COMMAND) $(FILE)
  25. + @$(PYTHON) $(NODEMCU-COMMAND) $(FILE)
  26. # Upload HTTP files only
  27. upload_http: $(HTTP_FILES)
  28. - @python $(NODEMCU-COMMAND) $(foreach f, $^, $(f))
  29. + @$(PYTHON) $(NODEMCU-COMMAND) $(foreach f, $^, $(f))
  30. # Upload httpserver lua files (init and server module)
  31. upload_server: $(LUA_FILES)
  32. - @python $(NODEMCU-COMMAND) $(foreach f, $^, $(f))
  33. + @$(PYTHON) $(NODEMCU-COMMAND) $(foreach f, $^, $(f))
  34. # Upload all
  35. upload_all: $(LUA_FILES) $(HTTP_FILES)
  36. - @python $(NODEMCU-COMMAND) $(foreach f, $^, $(f))
  37. + @$(PYTHON) $(NODEMCU-COMMAND) $(foreach f, $^, $(f))