update eez-framework

This commit is contained in:
Martin Vladic 2022-11-25 11:07:23 +01:00
parent df4755b4c6
commit 1bbc63f121
8 changed files with 14 additions and 14 deletions

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "eez"]
path = eez
path = eez-framework
url = https://github.com/eez-open/eez-framework

View File

@ -48,10 +48,10 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
endif()
include_directories(
./
./eez/libs/agg
./eez/platform/simulator
./src/conf
./src
./eez-framework/src
./eez-framework/src/eez/libs/agg
./eez-framework/src/eez/platform/simulator
)
@ -62,15 +62,15 @@ set(header_files)
################################################################################
# EEZ Framework files
file(GLOB_RECURSE src_eez
eez/*.cpp
eez/*.c
./eez-framework/src/eez/*.cpp
./eez-framework/src/eez/*.c
)
file(GLOB_RECURSE header_eez
eez/*.h
./eez-framework/src/eez/*.h
)
# exclude STM32 platform specific files
set (EXCLUDE_DIR "eez/platform/stm32")
set (EXCLUDE_DIR "./eez-framework/src/eez/platform/stm32")
foreach (TMP_PATH ${src_eez})
string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
@ -85,7 +85,7 @@ foreach (TMP_PATH ${header_eez})
endforeach(TMP_PATH)
# exclude libscpi
set (EXCLUDE_DIR "eez/libs/libscpi")
set (EXCLUDE_DIR "./eez-framework/src/eez/libs/libscpi")
foreach (TMP_PATH ${src_eez})
string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)

1
eez

@ -1 +0,0 @@
Subproject commit 3051f99c87634240d3e7af3c58d9f7594b267519

1
eez-framework Submodule

@ -0,0 +1 @@
Subproject commit e67a5a5008f34d6d19b08131e0807438998dfdc5

View File

@ -1,3 +0,0 @@
#pragma once
#include "../../gui/document.h"

View File

@ -0,0 +1,3 @@
#pragma once
#include "gui/document.h"

Binary file not shown.