Browse 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 7 years ago
parent
commit
627730948d
2 changed files with 15 additions and 1 deletions
  1. 6
    1
      .gitignore
  2. 9
    0
      Marlin/platformio.ini

+ 6
- 1
.gitignore View File

1
 #
1
 #
2
 # Marlin 3D Printer Firmware
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
 # Based on Sprinter and grbl.
5
 # Based on Sprinter and grbl.
6
 # Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
6
 # Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
118
 #PlatformIO files/dirs
118
 #PlatformIO files/dirs
119
 .pioenvs
119
 .pioenvs
120
 .piolib
120
 .piolib
121
+.piolibdeps
121
 
122
 
122
 #Visual Studio
123
 #Visual Studio
123
 *.sln
124
 *.sln
127
 Marlin/Debug/
128
 Marlin/Debug/
128
 Marlin/__vm/
129
 Marlin/__vm/
129
 Marlin/.vs/
130
 Marlin/.vs/
131
+
132
+#cmake
133
+CMakeLists.txt
134
+Marlin/CMakeLists.txt

+ 9
- 0
Marlin/platformio.ini View File

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

Loading…
Cancel
Save