Skip to content

Commit e9cb605

Browse files
committed
Added another GL application
1 parent 9e3b1f3 commit e9cb605

File tree

3 files changed

+2183
-12
lines changed

3 files changed

+2183
-12
lines changed

CMakeLists.txt

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -192,30 +192,54 @@ set(TINYGL_SOURCES
192192
external/tinygl_1b/src/ztext.c
193193
)
194194

195+
add_library(
196+
tinygl_1b
197+
${TINYGL_SOURCES}
198+
)
199+
200+
target_include_directories(tinygl_1b
201+
PRIVATE external/tinygl_1b/src
202+
PUBLIC external/tinygl_1b/include
203+
)
204+
205+
target_compile_options(tinygl_1b PUBLIC -Wno-unused-function
206+
-Wno-unused-variable
207+
-Wno-parentheses
208+
-Wno-unused-but-set-variable)
209+
195210
add_executable(rpi_lcd_3d_test
196211
src/rpi_lcd_3d_test.c
197212
src/u8g2_ili9486_driver.c
198213
src/gears.c
199-
${TINYGL_SOURCES}
200214
)
201215

202-
target_include_directories(rpi_lcd_3d_test
203-
PRIVATE external/tinygl_1b/src external/tinygl_1b/include
204-
)
205-
206-
target_compile_options(rpi_lcd_3d_test PRIVATE -Wno-unused-function
207-
-Wno-unused-variable
208-
-Wno-parentheses
209-
-Wno-unused-but-set-variable)
210-
211216
pico_generate_pio_header(rpi_lcd_3d_test ${CMAKE_CURRENT_LIST_DIR}/src/ili9486_lcd_8bit_data.pio)
212217

213-
target_link_libraries(rpi_lcd_3d_test
218+
target_link_libraries(rpi_lcd_3d_test PRIVATE
214219
pico_stdlib
215220
hardware_irq
216221
hardware_pwm
217222
hardware_pio
218223
hardware_dma
219-
u8g2)
224+
u8g2
225+
tinygl_1b)
220226

221227
pico_add_extra_outputs(rpi_lcd_3d_test)
228+
229+
add_executable(rpi_lcd_3d_skull_test
230+
src/rpi_lcd_3d_skull_test.c
231+
src/u8g2_ili9486_driver.c
232+
)
233+
234+
pico_generate_pio_header(rpi_lcd_3d_skull_test ${CMAKE_CURRENT_LIST_DIR}/src/ili9486_lcd_8bit_data.pio)
235+
236+
target_link_libraries(rpi_lcd_3d_skull_test PRIVATE
237+
pico_stdlib
238+
hardware_irq
239+
hardware_pwm
240+
hardware_pio
241+
hardware_dma
242+
u8g2
243+
tinygl_1b)
244+
245+
pico_add_extra_outputs(rpi_lcd_3d_skull_test)

0 commit comments

Comments
 (0)