Parcourir la source

Add U8glib as a dependency to platformio.ini for those who use PlatformIO; this makes compiling even easier as u8glib will be downloaded and included automatically.

Also added the new .pio-related directory to .gitignore, and a few ignores for those who use cmake.
Brian il y a 7 ans
Parent
révision
627730948d
2 fichiers modifiés avec 15 ajouts et 1 suppressions
  1. 6
    1
      .gitignore
  2. 9
    0
      Marlin/platformio.ini

+ 6
- 1
.gitignore Voir le fichier

@@ -1,6 +1,6 @@
1 1
 #
2 2
 # Marlin 3D Printer Firmware
3
-# Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+# Copyright (C) 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
 #
5 5
 # Based on Sprinter and grbl.
6 6
 # Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
@@ -118,6 +118,7 @@ tags
118 118
 #PlatformIO files/dirs
119 119
 .pioenvs
120 120
 .piolib
121
+.piolibdeps
121 122
 
122 123
 #Visual Studio
123 124
 *.sln
@@ -127,3 +128,7 @@ Marlin/Release/
127 128
 Marlin/Debug/
128 129
 Marlin/__vm/
129 130
 Marlin/.vs/
131
+
132
+#cmake
133
+CMakeLists.txt
134
+Marlin/CMakeLists.txt

+ 9
- 0
Marlin/platformio.ini Voir le fichier

@@ -15,14 +15,19 @@
15 15
 src_dir = ./
16 16
 envs_dir = ../.pioenvs
17 17
 lib_dir = ../.piolib
18
+libdeps_dir = ../.piolibdeps
18 19
 env_default = mega2560
19 20
 
21
+[common]
22
+lib_deps = U8glib@1.19.1
23
+
20 24
 [env:mega2560]
21 25
 platform = atmelavr
22 26
 framework = arduino
23 27
 board = megaatmega2560
24 28
 build_flags = -I $BUILDSRC_DIR
25 29
 board_f_cpu = 16000000L
30
+lib_deps = ${common.lib_deps}
26 31
 
27 32
 [env:mega1280]
28 33
 platform = atmelavr
@@ -30,6 +35,7 @@ framework = arduino
30 35
 board = megaatmega1280
31 36
 build_flags = -I $BUILDSRC_DIR
32 37
 board_f_cpu = 16000000L
38
+lib_deps = ${common.lib_deps}
33 39
 
34 40
 [env:printrboard]
35 41
 platform = teensy
@@ -38,12 +44,14 @@ board = teensy20pp
38 44
 build_flags =  -I $BUILDSRC_DIR -D MOTHERBOARD=BOARD_PRINTRBOARD
39 45
 # Bug in arduino framework does not allow boards running at 20Mhz
40 46
 #board_f_cpu = 20000000L
47
+lib_deps = ${common.lib_deps}
41 48
 
42 49
 [env:brainwavepro]
43 50
 platform = teensy
44 51
 framework = arduino
45 52
 board = teensy20pp
46 53
 build_flags = -I $BUILDSRC_DIR -D MOTHERBOARD=BOARD_BRAINWAVE_PRO -D AT90USBxx_TEENSYPP_ASSIGNMENTS
54
+lib_deps = ${common.lib_deps}
47 55
 
48 56
 [env:rambo]
49 57
 platform = atmelavr
@@ -51,3 +59,4 @@ framework = arduino
51 59
 board = reprap_rambo
52 60
 build_flags = -I $BUILDSRC_DIR
53 61
 board_f_cpu = 16000000L
62
+lib_deps = ${common.lib_deps}

Chargement…
Annuler
Enregistrer