mirror of
https://github.com/eez-open/eez-flow-template-sdl.git
synced 2026-11-17 05:28:55 +01:00
update eez-framework
This commit is contained in:
parent
df4755b4c6
commit
1bbc63f121
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -1,3 +1,3 @@
|
|||||||
[submodule "eez"]
|
[submodule "eez"]
|
||||||
path = eez
|
path = eez-framework
|
||||||
url = https://github.com/eez-open/eez-framework
|
url = https://github.com/eez-open/eez-framework
|
||||||
|
|||||||
@ -48,10 +48,10 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
./
|
./src
|
||||||
./eez/libs/agg
|
./eez-framework/src
|
||||||
./eez/platform/simulator
|
./eez-framework/src/eez/libs/agg
|
||||||
./src/conf
|
./eez-framework/src/eez/platform/simulator
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -62,15 +62,15 @@ set(header_files)
|
|||||||
################################################################################
|
################################################################################
|
||||||
# EEZ Framework files
|
# EEZ Framework files
|
||||||
file(GLOB_RECURSE src_eez
|
file(GLOB_RECURSE src_eez
|
||||||
eez/*.cpp
|
./eez-framework/src/eez/*.cpp
|
||||||
eez/*.c
|
./eez-framework/src/eez/*.c
|
||||||
)
|
)
|
||||||
file(GLOB_RECURSE header_eez
|
file(GLOB_RECURSE header_eez
|
||||||
eez/*.h
|
./eez-framework/src/eez/*.h
|
||||||
)
|
)
|
||||||
|
|
||||||
# exclude STM32 platform specific files
|
# 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})
|
foreach (TMP_PATH ${src_eez})
|
||||||
string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
|
string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
|
||||||
if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
|
if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
|
||||||
@ -85,7 +85,7 @@ foreach (TMP_PATH ${header_eez})
|
|||||||
endforeach(TMP_PATH)
|
endforeach(TMP_PATH)
|
||||||
|
|
||||||
# exclude libscpi
|
# exclude libscpi
|
||||||
set (EXCLUDE_DIR "eez/libs/libscpi")
|
set (EXCLUDE_DIR "./eez-framework/src/eez/libs/libscpi")
|
||||||
foreach (TMP_PATH ${src_eez})
|
foreach (TMP_PATH ${src_eez})
|
||||||
string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
|
string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
|
||||||
if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
|
if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
|
||||||
|
|||||||
1
eez
1
eez
@ -1 +0,0 @@
|
|||||||
Subproject commit 3051f99c87634240d3e7af3c58d9f7594b267519
|
|
||||||
1
eez-framework
Submodule
1
eez-framework
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit e67a5a5008f34d6d19b08131e0807438998dfdc5
|
||||||
@ -1,3 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../../gui/document.h"
|
|
||||||
3
src/eez-framework-gui-conf.h
Normal file
3
src/eez-framework-gui-conf.h
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "gui/document.h"
|
||||||
Binary file not shown.
Loading…
Reference in New Issue
Block a user