Skip to content

Commit 7cda811

Browse files
newdigatenewdigate
committed
improvements to noinstall
1 parent a54552f commit 7cda811

14 files changed

+49
-181
lines changed

‎.github/workflows/ubuntu-opengl.yml

+1-19
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,9 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v2
1919

20-
- uses: actions/checkout@v2
21-
with:
22-
repository: newdigate/teensy-x86-stubs
23-
path: teensy-x86-stubs
24-
25-
- uses: actions/checkout@v2
26-
with:
27-
repository: newdigate/teensy-gfx
28-
path: teensy-gfx
29-
3020
- name: download dependencies
3121
run: sudo apt-get update && sudo apt-get install -yq libglfw3 libglfw3-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libx11-dev libxmu-dev libxi-dev libgl-dev libglew-dev
3222

33-
- name: Make and Install teensy-x86-stubs
34-
run: |
35-
cd teensy-x86-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
36-
37-
- name: Make and Install teensy-gfx
38-
run: |
39-
cd teensy-gfx && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
40-
4123
- name: Create Build Environment
4224
# Some projects don't allow in-source building, so create a separate build directory
4325
# We'll use this as our working directory for all subsequent commands
@@ -51,7 +33,7 @@ jobs:
5133
# Note the current convention is to use the -S and -B options here to specify source
5234
# and build directories, but this is only available with CMake 3.13 and higher.
5335
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
54-
run: cmake $GITHUB_WORKSPACE/extras/opengl/src -DCMAKE_BUILD_TYPE=$BUILD_TYPE
36+
run: cmake $GITHUB_WORKSPACE/extras/opengl -DCMAKE_BUILD_TYPE=$BUILD_TYPE
5537

5638
- name: Build
5739
working-directory: ${{github.workspace}}/build

‎.github/workflows/ubuntu_x64_cmake.yml

-18
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,6 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v2
2020

21-
- uses: actions/checkout@v2
22-
with:
23-
repository: newdigate/teensy-x86-stubs
24-
path: teensy-x86-stubs
25-
26-
- uses: actions/checkout@v2
27-
with:
28-
repository: newdigate/teensy-gfx
29-
path: teensy-gfx
30-
31-
- name: Make and Install Dependencies
32-
run: |
33-
cd teensy-x86-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
34-
35-
- name: Make and Install teensy-gfx
36-
run: |
37-
cd teensy-gfx && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
38-
3921
- name: Create Build Environment
4022
# Some projects don't allow in-source building, so create a separate build directory
4123
# We'll use this as our working directory for all subsequent commands

‎CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ set(CMAKE_CXX_STANDARD 17)
66
include(Dependencies.CMake.in)
77

88
add_subdirectory(src)
9+
add_subdirectory(extras/opengl)

‎Dependencies.CMake.in

+2-8
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,5 @@ FetchContent_MakeAvailable(cmake_declare_and_fetch)
1010
include("${FETCHCONTENT_BASE_DIR}/cmake_declare_and_fetch-src/DeclareAndFetchCMake.in")
1111
#********** CMAKE DECLARE AND FETCH MACRO ******
1212

13-
# ********* x86 teensy cores :: feature/shared_serial branch
14-
set(BUILD_SHARED_LIBRARY ON)
15-
set(REDIRECT_SERIAL_OUT_TO_STD_OUT OFF)
16-
message("--REDIRECT_SERIAL_OUT_TO_STD_OUT ${REDIRECT_SERIAL_OUT_TO_STD_OUT}" )
17-
DeclareAndFetch(teensy_x86_stubs https://github.com/newdigate/teensy-x86-stubs.git feature/shared_serial src)
18-
19-
# ********* x86 gfx :: main branch
20-
DeclareAndFetch(teensy_gfx https://github.com/newdigate/teensy-gfx.git main src)
13+
DeclareAndFetch(teensy_x86_stubs https://github.com/newdigate/teensy-x86-stubs.git noinstall src)
14+
DeclareAndFetch(teensy_gfx https://github.com/newdigate/teensy-gfx.git noinstall src)

‎extras/opengl/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ project(teensy_st7735_linux_extras_opengl CXX)
33

44
set(CMAKE_CXX_STANDARD 11)
55

6-
add_subdirectory(src)
6+
add_subdirectory(src)
7+
add_subdirectory(examples)

‎extras/opengl/common.cmake.in

+5-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
find_package(teensy_x86_stubs)
2-
include_directories(${teensy_x86_stubs_INCLUDE_DIR})
3-
4-
find_package(teensy_x86_sd_stubs)
5-
include_directories(${teensy_x86_sd_stubs_INCLUDE_DIR})
6-
7-
find_package(teensy_x86_encoder_stubs)
8-
include_directories(${teensy_x86_encoder_stubs_INCLUDE_DIR})
9-
10-
find_package(teensy_x86_bounce2_stubs)
11-
include_directories(${teensy_x86_bounce2_stubs_INCLUDE_DIR})
12-
13-
find_package(teensy_st7735_linux_stubs)
14-
include_directories(${teensy_st7735_linux_stubs_INCLUDE_DIR})
15-
16-
find_package(teensy_st7735_linux_opengl)
17-
include_directories(${teensy_st7735_linux_extras_opengl_INCLUDE_DIR})
1+
DeclareAndFetch(teensy_x86_stubs https://github.com/newdigate/teensy-x86-stubs.git noinstall src)
2+
DeclareAndFetch(teensy_x86_sd_stubs https://github.com/newdigate/teensy-x86-sd-stubs.git noinstall src)
3+
DeclareAndFetch(teensy_gfx https://github.com/newdigate/teensy-gfx.git main src)
4+
DeclareAndFetch(teensy_x86_encoder_stubs https://github.com/newdigate/teensy-x86-encoder-stubs.git noinstall src)
5+
DeclareAndFetch(teensy_x86_bounce2_stubs https://github.com/newdigate/teensy-x86-bounce2-stubs.git noinstall src)

‎extras/opengl/examples/basic/CMakeLists.txt

+7-22
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,20 @@ project(teensy_st7735_linux_extras_opengl_examples_basic C CXX)
33

44
set(CMAKE_CXX_STANDARD 17)
55

6-
find_package(teensy_x86_stubs)
7-
include_directories(${teensy_x86_stubs_INCLUDE_DIR})
8-
9-
find_package(teensy_x86_encoder_stubs)
10-
include_directories(${teensy_x86_encoder_stubs_INCLUDE_DIR})
11-
12-
find_package(teensy_x86_bounce2_stubs)
13-
include_directories(${teensy_x86_bounce2_stubs_INCLUDE_DIR})
14-
15-
find_package(teensy_gfx)
16-
include_directories(${teensy_gfx_INCLUDE_DIR})
17-
18-
find_package(teensy_st7735_linux_stubs)
19-
include_directories(${teensy_st7735_linux_stubs_INCLUDE_DIR})
20-
216
include_directories(../../src)
227

238
add_definitions(-fms-extensions)
249
add_definitions(-DArduino=146)
2510

2611
add_executable(basic graphicstest.cpp)
2712

28-
target_link_libraries(basic ${teensy_x86_stubs_LIBS})
29-
target_link_libraries(basic ${teensy_x86_sd_stubs_LIBS})
30-
target_link_libraries(basic ${teensy_x86_bounce2_stubs_LIBS})
31-
target_link_libraries(basic ${teensy_x86_encoder_stubs_LIBS})
32-
target_link_libraries(basic ${teensy_gfx_LIBS})
33-
target_link_libraries(basic ${teensy_st7735_linux_stubs_LIBS})
34-
target_link_libraries(basic ${teensy_st7735_linux_extras_opengl_LIBS})
13+
target_link_libraries(basic teensy_x86_stubs)
14+
target_link_libraries(basic teensy_x86_sd_stubs)
15+
target_link_libraries(basic teensy_x86_bounce2_stubs)
16+
target_link_libraries(basic teensy_x86_encoder_stubs)
17+
target_link_libraries(basic teensy_gfx)
18+
target_link_libraries(basic teensy_st7735_linux_stubs)
19+
target_link_libraries(basic teensy_st7735_linux_opengl)
3520

3621
include(../../opengl.cmake.in)
3722
target_link_libraries(basic ${LIBS})

‎extras/opengl/examples/button/CMakeLists.txt

+8-24
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,22 @@ set(CMAKE_CXX_STANDARD 17)
44

55
# comment out the line below to reference source, rather than referencing installed libraries (default)
66

7-
find_package(teensy_x86_stubs)
8-
include_directories(${teensy_x86_stubs_INCLUDE_DIR})
9-
10-
find_package(teensy_gfx)
11-
include_directories(${teensy_gfx_INCLUDE_DIR})
12-
13-
find_package(teensy_x86_sd_stubs)
14-
include_directories(${teensy_x86_sd_stubs_INCLUDE_DIR})
15-
16-
find_package(teensy_x86_encoder_stubs)
17-
include_directories(${teensy_x86_encoder_stubs_INCLUDE_DIR})
18-
19-
find_package(teensy_x86_bounce2_stubs)
20-
include_directories(${teensy_x86_bounce2_stubs_INCLUDE_DIR})
21-
22-
find_package(teensy_st7735_linux_stubs)
23-
include_directories(${teensy_st7735_linux_stubs_INCLUDE_DIR})
24-
257
include_directories(../../src)
8+
DeclareAndFetch(teensy_x86_encoder_stubs https://github.com/newdigate/teensy-x86-encoder-stubs.git noinstall src)
9+
DeclareAndFetch(teensy_x86_bounce2_stubs https://github.com/newdigate/teensy-x86-bounce2-stubs.git noinstall src)
2610

2711
include(../../opengl.cmake.in)
2812

2913
set(APP_SOURCES graphicstest.cpp)
3014

3115
add_executable(button ${APP_SOURCES})
3216

33-
target_link_libraries(button ${teensy_x86_stubs_LIBS})
34-
target_link_libraries(button ${teensy_x86_bounce2_stubs_LIBS})
35-
target_link_libraries(button ${teensy_st7735_linux_stubs_LIBS})
36-
target_link_libraries(button ${teensy_st7735_linux_extras_opengl_LIBS})
37-
target_link_libraries(button ${teensy_x86_encoder_stubs_LIBS})
38-
target_link_libraries(button ${teensy_gfx_LIBS})
17+
target_link_libraries(button teensy_x86_stubs)
18+
target_link_libraries(button teensy_x86_bounce2_stubs)
19+
target_link_libraries(button teensy_st7735_linux_stubs)
20+
target_link_libraries(button teensy_st7735_linux_opengl)
21+
target_link_libraries(button teensy_x86_encoder_stubs)
22+
target_link_libraries(button teensy_gfx)
3923

4024
target_link_libraries(button ${LIBS})
4125

‎extras/opengl/examples/scrolltest/CMakeLists.txt

+5-23
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,16 @@ cmake_minimum_required(VERSION 3.5)
22
project(teensy_st7735_linux_extras_opengl_examples_scrolltest C CXX)
33
set(CMAKE_CXX_STANDARD 17)
44

5-
find_package(teensy_x86_stubs)
6-
include_directories(${teensy_x86_stubs_INCLUDE_DIR})
7-
8-
find_package(teensy_gfx)
9-
include_directories(${teensy_gfx_INCLUDE_DIR})
10-
11-
find_package(teensy_x86_sd_stubs)
12-
include_directories(${teensy_x86_sd_stubs_INCLUDE_DIR})
13-
14-
find_package(teensy_x86_encoder_stubs)
15-
include_directories(${teensy_x86_encoder_stubs_INCLUDE_DIR})
16-
17-
find_package(teensy_x86_bounce2_stubs)
18-
include_directories(${teensy_x86_bounce2_stubs_INCLUDE_DIR})
19-
20-
find_package(teensy_st7735_linux_stubs)
21-
include_directories(${teensy_st7735_linux_stubs_INCLUDE_DIR})
22-
235
include_directories(../../src)
246
include(../../opengl.cmake.in)
257

268
set(APP_SOURCES scrolltest.cpp)
279

2810
add_executable(scrolltest ${APP_SOURCES})
2911

30-
target_link_libraries(scrolltest ${teensy_x86_stubs_LIBS})
31-
target_link_libraries(scrolltest ${teensy_x86_bounce2_stubs_LIBS})
32-
target_link_libraries(scrolltest ${teensy_st7735_linux_stubs_LIBS})
33-
target_link_libraries(scrolltest ${teensy_st7735_linux_extras_opengl_LIBS})
12+
target_link_libraries(scrolltest teensy_x86_stubs)
13+
target_link_libraries(scrolltest teensy_x86_bounce2_stubs)
14+
target_link_libraries(scrolltest teensy_st7735_linux_stubs)
15+
target_link_libraries(scrolltest teensy_st7735_linux_opengl)
3416
target_link_libraries(scrolltest ${LIBS})
35-
target_link_libraries(scrolltest ${teensy_gfx_LIBS})
17+
target_link_libraries(scrolltest teensy_gfx)

‎extras/opengl/examples/scrolltest/scrolltest.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include "st7735_opengl.h"
1717
#include "st7735_opengl_main.h"
18-
#include "st7735_t3_font_ComicSansMS.h"
18+
#include "../../../src/st7735_t3_font_ComicSansMS.h"
1919

2020
#define ST7735_BLACK 0x0000
2121
#define ST7735_WHITE 0xFFFF

‎extras/opengl/examples/spitftbitmap/CMakeLists.txt

+8-23
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,19 @@ cmake_minimum_required(VERSION 3.5)
22
project(teensy_st7735_linux_extras_opengl_examples_spitftbitmap C CXX)
33
set(CMAKE_CXX_STANDARD 17)
44

5-
find_package(teensy_x86_stubs)
6-
include_directories(${teensy_x86_stubs_INCLUDE_DIR})
7-
8-
find_package(teensy_gfx)
9-
include_directories(${teensy_gfx_INCLUDE_DIR})
10-
11-
find_package(teensy_x86_sd_stubs)
12-
include_directories(${teensy_x86_sd_stubs_INCLUDE_DIR})
13-
14-
find_package(teensy_x86_encoder_stubs)
15-
include_directories(${teensy_x86_encoder_stubs_INCLUDE_DIR})
16-
17-
find_package(teensy_x86_bounce2_stubs)
18-
include_directories(${teensy_x86_bounce2_stubs_INCLUDE_DIR})
19-
20-
find_package(teensy_st7735_linux_stubs)
21-
include_directories(${teensy_st7735_linux_stubs_INCLUDE_DIR})
5+
DeclareAndFetch(teensy_x86_sd_stubs https://github.com/newdigate/teensy-x86-sd-stubs.git noinstall src)
226

237
include_directories(../../src)
8+
include_directories(../../../../src)
249
include(../../opengl.cmake.in)
2510

2611
set(APP_SOURCES spitftbitmap.cpp)
2712

2813
add_executable(spitftbitmap ${APP_SOURCES})
2914

30-
target_link_libraries(spitftbitmap ${teensy_x86_stubs_LIBS})
31-
target_link_libraries(spitftbitmap ${teensy_x86_bounce2_stubs_LIBS})
32-
target_link_libraries(spitftbitmap ${teensy_st7735_linux_stubs_LIBS})
33-
target_link_libraries(spitftbitmap ${teensy_st7735_linux_extras_opengl_LIBS})
34-
target_link_libraries(spitftbitmap ${teensy_x86_sd_stubs_LIBS} ${LIBS})
35-
target_link_libraries(spitftbitmap ${teensy_gfx_LIBS})
15+
target_link_libraries(spitftbitmap teensy_x86_stubs)
16+
target_link_libraries(spitftbitmap teensy_x86_bounce2_stubs)
17+
target_link_libraries(spitftbitmap teensy_st7735_linux_stubs)
18+
target_link_libraries(spitftbitmap teensy_st7735_linux_opengl)
19+
target_link_libraries(spitftbitmap teensy_x86_sd_stubs ${LIBS})
20+
target_link_libraries(spitftbitmap teensy_gfx)

‎extras/opengl/examples/spitftbitmap/spitftbitmap.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <SD.h>
2727

2828
#include "st7735_opengl.h"
29+
#include "st7735_opengl_main.h"
2930
#include "parrot.h"
3031
#define SD_CS 4
3132
// Use hardware SPI (on Uno, #13, #12, #11) and the above for CS/DC
@@ -40,7 +41,7 @@ int st7735_main(int argc, char** argv) {
4041
return 0;
4142
}
4243

43-
int main() {
44+
void setup() {
4445
Serial.begin(9600);
4546
SD.setSDCardFileData((char *)parrot_bmp, parrot_bmp_len);
4647
tft.useFrameBuffer(true);
@@ -91,7 +92,7 @@ int main() {
9192

9293
void loop() {
9394
tft.updateScreen();
94-
delay(10);
95+
delay(100000000);
9596
}
9697
// This function opens a Windows Bitmap (BMP) file and
9798
// displays it at the given coordinates. It's sped up

‎extras/opengl/examples/thread/CMakeLists.txt

+5-23
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,6 @@ cmake_minimum_required(VERSION 3.5)
22
project(teensy_st7735_linux_extras_opengl_examples_basic C CXX)
33
set(CMAKE_CXX_STANDARD 11)
44

5-
find_package(teensy_x86_stubs)
6-
include_directories(${teensy_x86_stubs_INCLUDE_DIR})
7-
8-
find_package(teensy_gfx)
9-
include_directories(${teensy_gfx_INCLUDE_DIR})
10-
11-
find_package(teensy_x86_sd_stubs)
12-
include_directories(${teensy_x86_sd_stubs_INCLUDE_DIR})
13-
14-
find_package(teensy_x86_encoder_stubs)
15-
include_directories(${teensy_x86_encoder_stubs_INCLUDE_DIR})
16-
17-
find_package(teensy_x86_bounce2_stubs)
18-
include_directories(${teensy_x86_bounce2_stubs_INCLUDE_DIR})
19-
20-
find_package(teensy_st7735_linux_stubs)
21-
include_directories(${teensy_st7735_linux_stubs_INCLUDE_DIR})
22-
235
include_directories(../../src)
246

257
include(../../opengl.cmake.in)
@@ -28,11 +10,11 @@ set(APP_SOURCES thread.cpp)
2810

2911
add_executable(thread ${APP_SOURCES})
3012

31-
target_link_libraries(thread ${teensy_x86_stubs_LIBS})
32-
target_link_libraries(thread ${teensy_x86_bounce2_stubs_LIBS})
33-
target_link_libraries(thread ${teensy_st7735_linux_stubs_LIBS})
34-
target_link_libraries(thread ${teensy_st7735_linux_extras_opengl_LIBS})
13+
target_link_libraries(thread teensy_x86_stubs)
14+
target_link_libraries(thread teensy_x86_bounce2_stubs)
15+
target_link_libraries(thread teensy_st7735_linux_stubs)
16+
target_link_libraries(thread teensy_st7735_linux_opengl)
3517
target_link_libraries(thread ${LIBS})
36-
target_link_libraries(thread ${teensy_gfx_LIBS})
18+
target_link_libraries(thread teensy_gfx)
3719

3820

‎extras/opengl/src/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set(teensy_st7735_linux_opengl_VERSION 1.0.0)
44
set(CMAKE_CXX_STANDARD 11)
55

66
include(../opengl.cmake.in)
7+
include(../common.cmake.in)
78

89
set(SOURCE_FILES
910
st7735_opengl.cpp

0 commit comments

Comments
 (0)