From 0446dd3ad8d95eae7e2042dae8ee43f29150869e Mon Sep 17 00:00:00 2001 From: Brian Date: Sat, 6 May 2017 06:17:07 -0400 Subject: [PATCH] PlatformIO-related changes - move platformio.ini out of source directory to be more consistent with 'normal' PlatformIO usage - facilitates IDE integration - add related .gitignores --- .gitignore | 4 ++++ Marlin/platformio.ini => platformio.ini | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) rename Marlin/platformio.ini => platformio.ini (93%) diff --git a/.gitignore b/.gitignore index e9301b9bb..bc9226570 100755 --- a/.gitignore +++ b/.gitignore @@ -132,3 +132,7 @@ Marlin/.vs/ #cmake CMakeLists.txt Marlin/CMakeLists.txt +CMakeListsPrivate.txt + +#CLion +cmake-build-* diff --git a/Marlin/platformio.ini b/platformio.ini similarity index 93% rename from Marlin/platformio.ini rename to platformio.ini index 2b8285313..2cc47133b 100644 --- a/Marlin/platformio.ini +++ b/platformio.ini @@ -12,10 +12,10 @@ # targets = upload [platformio] -src_dir = ./ -envs_dir = ../.pioenvs -lib_dir = ../.piolib -libdeps_dir = ../.piolibdeps +src_dir = Marlin +envs_dir = .pioenvs +lib_dir = .piolib +libdeps_dir = .piolibdeps env_default = mega2560 [common]