diff --git a/cmake.bat b/cmake.bat index 63de6cd..b05fb4b 100644 --- a/cmake.bat +++ b/cmake.bat @@ -6,6 +6,6 @@ if not exist "build\win32" mkdir "build\win32" cd build\win32 -cmake -G "Visual Studio 15 2017" ..\.. +cmake ..\.. -A Win32 cd ..\.. \ No newline at end of file diff --git a/eez-framework b/eez-framework index c3e0ac0..ebf2121 160000 --- a/eez-framework +++ b/eez-framework @@ -1 +1 @@ -Subproject commit c3e0ac049e0fda5a0d5518e2e00ee2f708099158 +Subproject commit ebf2121dd538ff6ac43919a4b5213a7eab566491 diff --git a/src/main.cpp b/src/main.cpp index b26fb11..c41bb3a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -10,9 +10,9 @@ uint32_t DISPLAY_HEIGHT = 272; void init() { eez::initAssetsMemory(); - eez::gui::loadMainAssets(eez::gui::assets, sizeof(eez::gui::assets)); - DISPLAY_WIDTH = eez::gui::g_mainAssets->settings->displayWidth; - DISPLAY_HEIGHT = eez::gui::g_mainAssets->settings->displayHeight; + eez::loadMainAssets(eez::gui::assets, sizeof(eez::gui::assets)); + DISPLAY_WIDTH = eez::g_mainAssets->settings->displayWidth; + DISPLAY_HEIGHT = eez::g_mainAssets->settings->displayHeight; eez::initOtherMemory(); eez::initAllocHeap(eez::ALLOC_BUFFER, eez::ALLOC_BUFFER_SIZE);