jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 21:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Windows SDL environment

Browse Source
This commit is contained in:
fvanroie 2021-03-09 23:12:08 +01:00
parent 5b21c715ff
commit aff19396fe
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dev/win32/hasp_win32.cpp
View File

@ -49,7 +49,8 @@ const char* Win32Device::get_hostname()
void Win32Device::set_hostname(const char* hostname) void Win32Device::set_hostname(const char* hostname)
{ {
_hostname = hostname; _hostname = hostname;
SDL_SetWindowTitle(monitor.window, hostname); monitor_title(hostname);
// SDL_SetWindowTitle(monitor.window, hostname);
} }
const char* Win32Device::get_core_version() const char* Win32Device::get_core_version()
{ {
@ -94,7 +95,8 @@ bool Win32Device::get_backlight_power()
void Win32Device::update_backlight() void Win32Device::update_backlight()
{ {
monitor_backlight(_backlight_power ? map(_backlight_level, 0, 100, 0, 255) : 0); uint8_t level = _backlight_power ? map(_backlight_level, 0, 100, 0, 255) : 0;
monitor_backlight(level);
} }
size_t Win32Device::get_free_max_block() size_t Win32Device::get_free_max_block()

2
tools/windows_build_extra.py
View File

@ -1,3 +1,5 @@
Import("env", "projenv")
env.Append( env.Append(
LINKFLAGS=[ LINKFLAGS=[
"-static", "-static",

21
user_setups/win32/emulator_64bits.ini → user_setups/win32/windows_sdl_64bits.ini
View File

@ -1,4 +1,4 @@
[env:emulator_64bits] [env:windows_sdl_64bits]
platform = native@^1.1.3 platform = native@^1.1.3
extra_scripts = extra_scripts =
tools/sdl2_build_extra.py tools/sdl2_build_extra.py
@ -41,8 +41,8 @@ build_flags =
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
-DCMAKE_VERBOSE_MAKEFILE=TRUE -DCMAKE_VERBOSE_MAKEFILE=TRUE
;-D NO_PERSISTENCE ;-D NO_PERSISTENCE
-I.pio/libdeps/emulator_64bits/paho/src -I.pio/libdeps/windows_sdl_64bits/paho/src
-I.pio/libdeps/emulator_64bits/ArduinoJson/src -I.pio/libdeps/windows_sdl_64bits/ArduinoJson/src
-I lib/ArduinoJson/src -I lib/ArduinoJson/src
-I lib/lv_fs_if -I lib/lv_fs_if
!python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))" !python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))"
@ -77,6 +77,7 @@ lib_deps =
;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip ;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip
https://github.com/eclipse/paho.mqtt.c.git https://github.com/eclipse/paho.mqtt.c.git
bblanchon/ArduinoJson@^6.17.2 ; Json(l) parser bblanchon/ArduinoJson@^6.17.2 ; Json(l) parser
https://github.com/fvanroie/lv_drivers
lib_ignore = lib_ignore =
paho paho
@ -87,12 +88,12 @@ src_filter =
+<*> +<*>
-<*.h> -<*.h>
+<../hal/sdl2> +<../hal/sdl2>
+<../.pio/libdeps/emulator_64bits/paho/src/*.c> +<../.pio/libdeps/windows_sdl_64bits/paho/src/*.c>
+<../.pio/libdeps/emulator_64bits/paho/src/MQTTClient.c> +<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTClient.c>
-<../.pio/libdeps/emulator_64bits/paho/src/MQTTAsync.c> -<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTAsync.c>
-<../.pio/libdeps/emulator_64bits/paho/src/MQTTAsyncUtils.c> -<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTAsyncUtils.c>
-<../.pio/libdeps/emulator_64bits/paho/src/MQTTVersion.c> -<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTVersion.c>
-<../.pio/libdeps/emulator_64bits/paho/src/SSLSocket.c> -<../.pio/libdeps/windows_sdl_64bits/paho/src/SSLSocket.c>
+<MQTTClient.c> +<MQTTClient.c>
-<MQTTAsync.c> -<MQTTAsync.c>
-<MQTTAsyncUtils.c> -<MQTTAsyncUtils.c>
@ -112,4 +113,4 @@ src_filter =
+<lang/> +<lang/>
-<log/> -<log/>
+<mqtt/> +<mqtt/>
+<../.pio/libdeps/emulator_64bits/ArduinoJson/src/ArduinoJson.h> +<../.pio/libdeps/windows_sdl_64bits/ArduinoJson/src/ArduinoJson.h>