diff --git a/include/lv_conf_v7.h b/include/lv_conf_v7.h index 68955047..99166358 100644 --- a/include/lv_conf_v7.h +++ b/include/lv_conf_v7.h @@ -183,7 +183,7 @@ typedef void* lv_group_user_data_t; typedef void* lv_fs_drv_user_data_t; /*File system interface*/ -#define LV_USE_FS_IF 1 +#define LV_USE_FS_IF 0 #if LV_USE_FS_IF # define LV_FS_IF_FATFS '\0' #if defined(STM32F4xx) // || defined(ARDUINO_ARCH_ESP8266) diff --git a/src/main_windows.cpp b/src/main_sdl2.cpp similarity index 100% rename from src/main_windows.cpp rename to src/main_sdl2.cpp diff --git a/tools/linux_build_extra.py b/tools/linux_build_extra.py new file mode 100644 index 00000000..c849af5c --- /dev/null +++ b/tools/linux_build_extra.py @@ -0,0 +1,19 @@ +Import("env", "projenv") + +# Override unused "upload" to execute compiled binary +from SCons.Script import AlwaysBuild +AlwaysBuild(env.Alias("build", "$BUILD_DIR/${PROGNAME}", "$BUILD_DIR/${PROGNAME}")) + +# Add custom target to explorer +env.AddTarget( + name = "execute", + dependencies = "$BUILD_DIR/${PROGNAME}", + actions = "$BUILD_DIR/${PROGNAME}", +# actions = 'cmd.exe /C "start cmd.exe /C $BUILD_DIR\${PROGNAME}.exe"', + title = "Execute", + description = "Build and execute", + group="General" +) + +#print('=====================================') +#print(env.Dump()) diff --git a/user_setups/linux_sdl/emulator_64bits.ini b/user_setups/linux_sdl/linux_sdl_64bits.ini similarity index 75% rename from user_setups/linux_sdl/emulator_64bits.ini rename to user_setups/linux_sdl/linux_sdl_64bits.ini index a83e7004..ac81d624 100644 --- a/user_setups/linux_sdl/emulator_64bits.ini +++ b/user_setups/linux_sdl/linux_sdl_64bits.ini @@ -1,6 +1,8 @@ -[env:emulator_64bits] +[env:linux_sdl_64bits] platform = native@^1.1.3 -extra_scripts = tools/sdl2_build_extra.py +extra_scripts = + tools/sdl2_build_extra.py + tools/linux_build_extra.py build_flags = ${env.build_flags} ; ----- Monitor @@ -37,8 +39,8 @@ build_flags = -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=TRUE ;-D NO_PERSISTENCE - -I.pio/libdeps/emulator_64bits/paho/src - -I.pio/libdeps/emulator_64bits/ArduinoJson/src + -I.pio/libdeps/linux_sdl_64bits/paho/src + -I.pio/libdeps/linux_sdl_64bits/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')]))" @@ -64,12 +66,12 @@ src_filter = +<*> -<*.h> +<../hal/sdl2> - +<../.pio/libdeps/emulator_64bits/paho/src/*.c> - +<../.pio/libdeps/emulator_64bits/paho/src/MQTTClient.c> - -<../.pio/libdeps/emulator_64bits/paho/src/MQTTAsync.c> - -<../.pio/libdeps/emulator_64bits/paho/src/MQTTAsyncUtils.c> - -<../.pio/libdeps/emulator_64bits/paho/src/MQTTVersion.c> - -<../.pio/libdeps/emulator_64bits/paho/src/SSLSocket.c> + +<../.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> + - - @@ -89,4 +91,4 @@ src_filter = + - + - +<../.pio/libdeps/emulator_64bits/ArduinoJson/src/ArduinoJson.h> + +<../.pio/libdeps/linux_sdl_64bits/ArduinoJson/src/ArduinoJson.h>