diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ee4f01af..4847e5a4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -158,7 +158,7 @@ jobs: - name: Enable Linux platform from platformio_override.ini run: | sed 's/; user_setups\/linux/user_setups\/linux/g' platformio_override-template.ini > platformio_override.ini - mkdir -p .pio/libdeps/linux_sdl_64bits/paho/src + mkdir -p .pio/libdeps/linux_sdl/paho/src - name: Install SDL2 library run: | sudo apt-get update @@ -172,10 +172,10 @@ jobs: - name: Enable Linux platform from platformio_override.ini run: | sed -i 's/; user_setups\/linux/user_setups\/linux/g' platformio_override.ini - mkdir -p .pio/libdeps/linux_sdl_64bits/paho/src + mkdir -p .pio/libdeps/linux_sdl/paho/src - name: Install SDL2 library run: | sudo apt-get update sudo apt-get install libsdl2-dev - name: Run PlatformIO - run: pio run -e linux_sdl_64bits + run: pio run -e linux_sdl diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml index a4baea49..e7e77c94 100644 --- a/.github/workflows/build_linux.yaml +++ b/.github/workflows/build_linux.yaml @@ -11,7 +11,7 @@ jobs: fail-fast: false matrix: environments: - - linux_sdl_64bits + - linux_sdl steps: - uses: actions/checkout@v3 @@ -43,7 +43,7 @@ jobs: - name: Enable Linux platform from platformio_override.ini run: | sed -i 's/; user_setups\/linux/user_setups\/linux/g' platformio_override.ini - mkdir -p .pio/libdeps/linux_sdl_64bits/paho/src + mkdir -p .pio/libdeps/linux_sdl/paho/src - name: Install SDL2 library run: | sudo apt-get update diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 62ef57b4..0d4bb86d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,7 +39,7 @@ jobs: - name: Enable Linux platform from platformio_override.ini run: | sed -i 's/; user_setups\/linux/user_setups\/linux/g' platformio_override.ini - mkdir -p .pio/libdeps/linux_sdl_64bits/paho/src + mkdir -p .pio/libdeps/linux_sdl/paho/src - name: Install SDL2 library run: | sudo apt-get update diff --git a/platformio_override-template.ini b/platformio_override-template.ini index 941fe815..f746bb26 100644 --- a/platformio_override-template.ini +++ b/platformio_override-template.ini @@ -6,11 +6,11 @@ [platformio] extra_configs = ; Uncomment or edit the lines to show more User Setups in the PIO sidebar - ; user_setups/darwin_sdl/*.ini + ; user_setups/darwin/*.ini ; user_setups/esp32/*.ini ; user_setups/esp32s2/*.ini ; user_setups/esp32s3/*.ini - ; user_setups/linux_sdl/*.ini + ; user_setups/linux/*.ini ; user_setups/stm32f4xx/*.ini ; user_setups/win32/*.ini diff --git a/user_setups/darwin_sdl/darwin_sdl_64bits.ini b/user_setups/darwin/darwin_sdl.ini similarity index 81% rename from user_setups/darwin_sdl/darwin_sdl_64bits.ini rename to user_setups/darwin/darwin_sdl.ini index 52f8aaa6..2b3a3642 100644 --- a/user_setups/darwin_sdl/darwin_sdl_64bits.ini +++ b/user_setups/darwin/darwin_sdl.ini @@ -1,4 +1,4 @@ -[env:darwin_sdl_64bits] +[env:darwin_sdl] lib_archive = false platform = native@^1.1.4 extra_scripts = @@ -49,8 +49,8 @@ build_flags = -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=TRUE ;-D NO_PERSISTENCE - -I.pio/libdeps/darwin_sdl_64bits/paho/src - -I.pio/libdeps/darwin_sdl_64bits/ArduinoJson/src + -I.pio/libdeps/darwin_sdl/paho/src + -I.pio/libdeps/darwin_sdl/ArduinoJson/src -I lib/ArduinoJson/src -I lib/lv_fs_if !python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))" @@ -85,12 +85,12 @@ lib_ignore = build_src_filter = +<*> -<*.h> - +<../.pio/libdeps/darwin_sdl_64bits/paho/src/*.c> - -<../.pio/libdeps/darwin_sdl_64bits/paho/src/MQTTClient.c> - +<../.pio/libdeps/darwin_sdl_64bits/paho/src/MQTTAsync.c> - +<../.pio/libdeps/darwin_sdl_64bits/paho/src/MQTTAsyncUtils.c> - -<../.pio/libdeps/darwin_sdl_64bits/paho/src/MQTTVersion.c> - -<../.pio/libdeps/darwin_sdl_64bits/paho/src/SSLSocket.c> + +<../.pio/libdeps/darwin_sdl/paho/src/*.c> + -<../.pio/libdeps/darwin_sdl/paho/src/MQTTClient.c> + +<../.pio/libdeps/darwin_sdl/paho/src/MQTTAsync.c> + +<../.pio/libdeps/darwin_sdl/paho/src/MQTTAsyncUtils.c> + -<../.pio/libdeps/darwin_sdl/paho/src/MQTTVersion.c> + -<../.pio/libdeps/darwin_sdl/paho/src/SSLSocket.c> - + + @@ -112,4 +112,4 @@ build_src_filter = + - + - +<../.pio/libdeps/darwin_sdl_64bits/ArduinoJson/src/ArduinoJson.h> + +<../.pio/libdeps/darwin_sdl/ArduinoJson/src/ArduinoJson.h> diff --git a/user_setups/linux_sdl/linux_fbdev_64bits.ini b/user_setups/linux/linux_fbdev.ini similarity index 77% rename from user_setups/linux_sdl/linux_fbdev_64bits.ini rename to user_setups/linux/linux_fbdev.ini index 999a73a7..c0d70a27 100644 --- a/user_setups/linux_sdl/linux_fbdev_64bits.ini +++ b/user_setups/linux/linux_fbdev.ini @@ -1,4 +1,4 @@ -[env:linux_fbdev_64bits] +[env:linux_fbdev] platform = native@^1.1.4 extra_scripts = tools/linux_build_extra.py @@ -46,8 +46,8 @@ build_flags = -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=TRUE ;-D NO_PERSISTENCE - -I.pio/libdeps/linux_fbdev_64bits/paho/src - -I.pio/libdeps/linux_fbdev_64bits/ArduinoJson/src + -I.pio/libdeps/linux_fbdev/paho/src + -I.pio/libdeps/linux_fbdev/ArduinoJson/src ; ----- Statically linked libraries -------------------- -lm @@ -71,12 +71,12 @@ lib_ignore = build_src_filter = +<*> -<*.h> - +<../.pio/libdeps/linux_fbdev_64bits/paho/src/*.c> - -<../.pio/libdeps/linux_fbdev_64bits/paho/src/MQTTClient.c> - +<../.pio/libdeps/linux_fbdev_64bits/paho/src/MQTTAsync.c> - +<../.pio/libdeps/linux_fbdev_64bits/paho/src/MQTTAsyncUtils.c> - -<../.pio/libdeps/linux_fbdev_64bits/paho/src/MQTTVersion.c> - -<../.pio/libdeps/linux_fbdev_64bits/paho/src/SSLSocket.c> + +<../.pio/libdeps/linux_fbdev/paho/src/*.c> + -<../.pio/libdeps/linux_fbdev/paho/src/MQTTClient.c> + +<../.pio/libdeps/linux_fbdev/paho/src/MQTTAsync.c> + +<../.pio/libdeps/linux_fbdev/paho/src/MQTTAsyncUtils.c> + -<../.pio/libdeps/linux_fbdev/paho/src/MQTTVersion.c> + -<../.pio/libdeps/linux_fbdev/paho/src/SSLSocket.c> - + + @@ -98,4 +98,4 @@ build_src_filter = + - + - +<../.pio/libdeps/linux_fbdev_64bits/ArduinoJson/src/ArduinoJson.h> + +<../.pio/libdeps/linux_fbdev/ArduinoJson/src/ArduinoJson.h> diff --git a/user_setups/linux_sdl/linux_sdl_64bits.ini b/user_setups/linux/linux_sdl.ini similarity index 80% rename from user_setups/linux_sdl/linux_sdl_64bits.ini rename to user_setups/linux/linux_sdl.ini index 222d8660..e1239f7d 100644 --- a/user_setups/linux_sdl/linux_sdl_64bits.ini +++ b/user_setups/linux/linux_sdl.ini @@ -1,4 +1,4 @@ -[env:linux_sdl_64bits] +[env:linux_sdl] platform = native@^1.1.4 extra_scripts = tools/sdl2_build_extra.py @@ -49,8 +49,8 @@ build_flags = -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=TRUE ;-D NO_PERSISTENCE - -I.pio/libdeps/linux_sdl_64bits/paho/src - -I.pio/libdeps/linux_sdl_64bits/ArduinoJson/src + -I.pio/libdeps/linux_sdl/paho/src + -I.pio/libdeps/linux_sdl/ArduinoJson/src !python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))" ; ----- Statically linked libraries -------------------- @@ -76,12 +76,12 @@ lib_ignore = build_src_filter = +<*> -<*.h> - +<../.pio/libdeps/linux_sdl_64bits/paho/src/*.c> - -<../.pio/libdeps/linux_sdl_64bits/paho/src/MQTTClient.c> - +<../.pio/libdeps/linux_sdl_64bits/paho/src/MQTTAsync.c> - +<../.pio/libdeps/linux_sdl_64bits/paho/src/MQTTAsyncUtils.c> - -<../.pio/libdeps/linux_sdl_64bits/paho/src/MQTTVersion.c> - -<../.pio/libdeps/linux_sdl_64bits/paho/src/SSLSocket.c> + +<../.pio/libdeps/linux_sdl/paho/src/*.c> + -<../.pio/libdeps/linux_sdl/paho/src/MQTTClient.c> + +<../.pio/libdeps/linux_sdl/paho/src/MQTTAsync.c> + +<../.pio/libdeps/linux_sdl/paho/src/MQTTAsyncUtils.c> + -<../.pio/libdeps/linux_sdl/paho/src/MQTTVersion.c> + -<../.pio/libdeps/linux_sdl/paho/src/SSLSocket.c> - + + @@ -103,4 +103,4 @@ build_src_filter = + - + - +<../.pio/libdeps/linux_sdl_64bits/ArduinoJson/src/ArduinoJson.h> + +<../.pio/libdeps/linux_sdl/ArduinoJson/src/ArduinoJson.h> diff --git a/user_setups/win32/windows_gdi_64bits.ini b/user_setups/win32/windows_gdi.ini similarity index 83% rename from user_setups/win32/windows_gdi_64bits.ini rename to user_setups/win32/windows_gdi.ini index e8f49fad..00b6ee1f 100644 --- a/user_setups/win32/windows_gdi_64bits.ini +++ b/user_setups/win32/windows_gdi.ini @@ -1,4 +1,4 @@ -[env:windows_gdi_64bits] +[env:windows_gdi] platform = native@^1.1.4 extra_scripts = tools/windows_build_extra.py @@ -55,8 +55,8 @@ build_flags = -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=TRUE ;-D NO_PERSISTENCE - -I.pio/libdeps/windows_gdi_64bits/paho/src - -I.pio/libdeps/windows_gdi_64bits/ArduinoJson/src + -I.pio/libdeps/windows_gdi/paho/src + -I.pio/libdeps/windows_gdi/ArduinoJson/src -I lib/lv_fs_if -I lib/lv_datetime -mconsole @@ -100,12 +100,12 @@ lib_ignore = build_src_filter = +<*> -<*.h> - +<../.pio/libdeps/windows_gdi_64bits/paho/src/*.c> - -<../.pio/libdeps/windows_gdi_64bits/paho/src/MQTTClient.c> - +<../.pio/libdeps/windows_gdi_64bits/paho/src/MQTTAsync.c> - +<../.pio/libdeps/windows_gdi_64bits/paho/src/MQTTAsyncUtils.c> - -<../.pio/libdeps/windows_gdi_64bits/paho/src/MQTTVersion.c> - -<../.pio/libdeps/windows_gdi_64bits/paho/src/SSLSocket.c> + +<../.pio/libdeps/windows_gdi/paho/src/*.c> + -<../.pio/libdeps/windows_gdi/paho/src/MQTTClient.c> + +<../.pio/libdeps/windows_gdi/paho/src/MQTTAsync.c> + +<../.pio/libdeps/windows_gdi/paho/src/MQTTAsyncUtils.c> + -<../.pio/libdeps/windows_gdi/paho/src/MQTTVersion.c> + -<../.pio/libdeps/windows_gdi/paho/src/SSLSocket.c> - + + @@ -127,5 +127,5 @@ build_src_filter = + - + - +<../.pio/libdeps/windows_gdi_64bits/ArduinoJson/src/ArduinoJson.h> + +<../.pio/libdeps/windows_gdi/ArduinoJson/src/ArduinoJson.h> + diff --git a/user_setups/win32/windows_sdl_64bits.ini b/user_setups/win32/windows_sdl.ini similarity index 84% rename from user_setups/win32/windows_sdl_64bits.ini rename to user_setups/win32/windows_sdl.ini index 850e8ae6..30364c1c 100644 --- a/user_setups/win32/windows_sdl_64bits.ini +++ b/user_setups/win32/windows_sdl.ini @@ -1,4 +1,4 @@ -[env:windows_sdl_64bits] +[env:windows_sdl] platform = native@^1.1.4 extra_scripts = tools/sdl2_build_extra.py @@ -59,8 +59,8 @@ build_flags = -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=TRUE ;-D NO_PERSISTENCE - -I.pio/libdeps/windows_sdl_64bits/paho/src - -I.pio/libdeps/windows_sdl_64bits/ArduinoJson/src + -I.pio/libdeps/windows_sdl/paho/src + -I.pio/libdeps/windows_sdl/ArduinoJson/src -I lib/lv_fs_if -I lib/lv_datetime !python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))" @@ -106,12 +106,12 @@ lib_ignore = build_src_filter = +<*> -<*.h> - +<../.pio/libdeps/windows_sdl_64bits/paho/src/*.c> - -<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTClient.c> - +<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTAsync.c> - +<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTAsyncUtils.c> - -<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTVersion.c> - -<../.pio/libdeps/windows_sdl_64bits/paho/src/SSLSocket.c> + +<../.pio/libdeps/windows_sdl/paho/src/*.c> + -<../.pio/libdeps/windows_sdl/paho/src/MQTTClient.c> + +<../.pio/libdeps/windows_sdl/paho/src/MQTTAsync.c> + +<../.pio/libdeps/windows_sdl/paho/src/MQTTAsyncUtils.c> + -<../.pio/libdeps/windows_sdl/paho/src/MQTTVersion.c> + -<../.pio/libdeps/windows_sdl/paho/src/SSLSocket.c> - + + @@ -133,5 +133,5 @@ build_src_filter = + - + - +<../.pio/libdeps/windows_sdl_64bits/ArduinoJson/src/ArduinoJson.h> + +<../.pio/libdeps/windows_sdl/ArduinoJson/src/ArduinoJson.h> +