From 860f845bdbdafab64320dd7cfa0f85e6d5c04559 Mon Sep 17 00:00:00 2001 From: ataweg Date: Sun, 14 Jul 2024 10:07:58 +0200 Subject: [PATCH] update lvgl and VS files --- LVGL_Simulator.prj | 18 + LvglPlatform/LVGL_Simulator.sln | 31 + LvglPlatform/LVGL_Simulator.vcxproj | 1864 +++++++++++++++++ LvglPlatform/LVGL_Simulator.vcxproj.filters | 1797 ++++++++++++++++ LvglPlatform/lvgl | 2 +- LvglWindows/LvglWindowsStatic.vcxproj | 3 + LvglWindows/LvglWindowsStatic.vcxproj.filters | 8 + .../LvglWindowsDesktopApplication.vcxproj | 8 +- ...lWindowsDesktopApplication.vcxproj.filters | 26 +- .../LvglWindowsSimulator.vcxproj | 3 + .../LvglWindowsSimulator.vcxproj.filters | 9 + 11 files changed, 3750 insertions(+), 19 deletions(-) create mode 100644 LVGL_Simulator.prj create mode 100644 LvglPlatform/LVGL_Simulator.sln create mode 100644 LvglPlatform/LVGL_Simulator.vcxproj create mode 100644 LvglPlatform/LVGL_Simulator.vcxproj.filters diff --git a/LVGL_Simulator.prj b/LVGL_Simulator.prj new file mode 100644 index 0000000..6bdf86a --- /dev/null +++ b/LVGL_Simulator.prj @@ -0,0 +1,18 @@ +[Project ID] +Signature=UE Proj: v.1 +[Project Information] +Use Relative Directory=1 +Relative to Project File=1 +Include Sub Directories=1 +Project Tagfile= +Project Wordfile= +Project TpFile= +Filter= +Create Tagfile=0 +[Files] +0=.\LvglPlatform\lvgl\examples\ +1=.\LvglPlatform\lvgl\src\ +2=awe-readme.txt +3=LvglWindowsDesktopApplication\LvglWindowsDesktopApplication.cpp +4=LvglWindowsSimulator\LvglWindowsSimulator.cpp +5=LvglWindowsSimulator\lv_conf.h diff --git a/LvglPlatform/LVGL_Simulator.sln b/LvglPlatform/LVGL_Simulator.sln new file mode 100644 index 0000000..a41d631 --- /dev/null +++ b/LvglPlatform/LVGL_Simulator.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34607.119 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LVGL_Simulator", "LVGL_Simulator.vcxproj", "{1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Debug|x64.ActiveCfg = Debug|x64 + {1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Debug|x64.Build.0 = Debug|x64 + {1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Debug|x86.ActiveCfg = Debug|Win32 + {1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Debug|x86.Build.0 = Debug|Win32 + {1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Release|x64.ActiveCfg = Release|x64 + {1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Release|x64.Build.0 = Release|x64 + {1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Release|x86.ActiveCfg = Release|Win32 + {1F57DE71-7CB2-450E-8D07-D6A4E93B77E4}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D1E6F1F4-F30B-412C-A4D8-8B40D9BA076A} + EndGlobalSection +EndGlobal diff --git a/LvglPlatform/LVGL_Simulator.vcxproj b/LvglPlatform/LVGL_Simulator.vcxproj new file mode 100644 index 0000000..cb88b60 --- /dev/null +++ b/LvglPlatform/LVGL_Simulator.vcxproj @@ -0,0 +1,1864 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 17.0 + {1F57DE71-7CB2-450E-8D07-D6A4E93B77E4} + + + + Application + true + v143 + + + Application + false + v143 + + + Application + true + v143 + + + Application + false + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/LvglPlatform/LVGL_Simulator.vcxproj.filters b/LvglPlatform/LVGL_Simulator.vcxproj.filters new file mode 100644 index 0000000..3db8392 --- /dev/null +++ b/LvglPlatform/LVGL_Simulator.vcxproj.filters @@ -0,0 +1,1797 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/LvglPlatform/lvgl b/LvglPlatform/lvgl index c50aa29..6b61d80 160000 --- a/LvglPlatform/lvgl +++ b/LvglPlatform/lvgl @@ -1 +1 @@ -Subproject commit c50aa2916d95d9c5d71a2176aaee6879ad5690ac +Subproject commit 6b61d80591e23df5cc50454ffb840b9f1a8b4a6c diff --git a/LvglWindows/LvglWindowsStatic.vcxproj b/LvglWindows/LvglWindowsStatic.vcxproj index f73b6db..61a7bf4 100644 --- a/LvglWindows/LvglWindowsStatic.vcxproj +++ b/LvglWindows/LvglWindowsStatic.vcxproj @@ -1543,6 +1543,9 @@ + + + diff --git a/LvglWindows/LvglWindowsStatic.vcxproj.filters b/LvglWindows/LvglWindowsStatic.vcxproj.filters index c00166a..f91b570 100644 --- a/LvglWindows/LvglWindowsStatic.vcxproj.filters +++ b/LvglWindows/LvglWindowsStatic.vcxproj.filters @@ -5515,6 +5515,14 @@ lvgl\examples\widgets\keyboard + + lvgl\examples\widgets\keyboard + + + lvgl\examples\widgets\keyboard + + + lvgl\examples\widgets\keyboard lvgl\examples\widgets\label diff --git a/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj b/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj index 87cce24..602950f 100644 --- a/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj +++ b/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj @@ -15,6 +15,7 @@ LVGL 9.0.0.0 Alpha 1 + 10.0 @@ -943,8 +944,6 @@ - - @@ -2081,8 +2080,6 @@ - - @@ -2541,6 +2538,9 @@ + + + diff --git a/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj.filters b/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj.filters index 53f12be..d986324 100644 --- a/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj.filters +++ b/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj.filters @@ -2719,12 +2719,6 @@ lvgl - - lvgl - - - lvgl - lvgl @@ -6133,12 +6127,6 @@ lvgl\tests\src\test_libs\rnd_unicodes\rnd_unicodes - - lvgl\tests\src\test_libs\rnd_unicodes\rnd_unicodes\src - - - lvgl\tests\src\test_libs\rnd_unicodes\rnd_unicodes\src - lvgl\tests\test_images\pngs @@ -7720,7 +7708,6 @@ {f514f744-494a-43ef-bac4-c1aa3033587c} - @@ -8550,7 +8537,18 @@ lvgl\examples\widgets\keyboard - + + + lvgl\examples\widgets\keyboard + + + + lvgl\examples\widgets\keyboard + + + lvgl\examples\widgets\keyboard + + lvgl\examples\widgets\label diff --git a/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj b/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj index 040979f..88556da 100644 --- a/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj +++ b/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj @@ -708,6 +708,9 @@ + + + diff --git a/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj.filters b/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj.filters index 3157dfa..f6534e8 100644 --- a/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj.filters +++ b/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj.filters @@ -1996,6 +1996,15 @@ lvgl\examples\widgets\keyboard + + lvgl\examples\widgets\keyboard + + + lvgl\examples\widgets\keyboard + + + lvgl\examples\widgets\keyboard + lvgl\examples\widgets\label