From 0f57f216b00dbad61aad40a27105c2d615baaac3 Mon Sep 17 00:00:00 2001 From: Martin Vladic Date: Fri, 29 Apr 2022 13:52:03 +0200 Subject: [PATCH] project name changed --- CMakeLists.txt | 44 +++++++++++++-------------- src/gui/app_context.cpp | 6 ++-- src/main.cpp | 4 +-- src/platform/simulator/emscripten/index.html | 2 +- src/platform/simulator/win32/icon.rc | Bin 1700 -> 1728 bytes 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4805c04..e599a77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10) -project(min_eez_sample) +project(eez-flow-template-sdl) set (CMAKE_CXX_STANDARD 17) @@ -138,62 +138,62 @@ if(WIN32) set(SOURCES src/platform/simulator/win32/icon.rc ${src_files}) endif() -add_executable(min_eez_sample ${src_files} ${header_files}) +add_executable(eez-flow-template-sdl ${src_files} ${header_files}) if(MSVC) - target_compile_options(min_eez_sample PRIVATE "/MP") + target_compile_options(eez-flow-template-sdl PRIVATE "/MP") endif() if (UNIX AND NOT(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) - target_link_libraries(min_eez_sample Threads::Threads bsd) + target_link_libraries(eez-flow-template-sdl Threads::Threads bsd) endif () -target_link_libraries(min_eez_sample ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES}) +target_link_libraries(eez-flow-template-sdl ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES}) if(WIN32) - target_link_libraries(min_eez_sample wsock32 ws2_32) + target_link_libraries(eez-flow-template-sdl wsock32 ws2_32) - add_custom_command(TARGET min_eez_sample POST_BUILD + add_custom_command(TARGET eez-flow-template-sdl POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/../../SDL2-2.0.14/lib/x86/SDL2.dll" - $) + $) - add_custom_command(TARGET min_eez_sample POST_BUILD + add_custom_command(TARGET eez-flow-template-sdl POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/../../SDL2_image-2.0.4/lib/x86/libjpeg-9.dll" - $) + $) - add_custom_command(TARGET min_eez_sample POST_BUILD + add_custom_command(TARGET eez-flow-template-sdl POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/../../SDL2_image-2.0.4/lib/x86/libpng16-16.dll" - $) + $) - add_custom_command(TARGET min_eez_sample POST_BUILD + add_custom_command(TARGET eez-flow-template-sdl POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/../../SDL2_image-2.0.4/lib/x86/libtiff-5.dll" - $) + $) - add_custom_command(TARGET min_eez_sample POST_BUILD + add_custom_command(TARGET eez-flow-template-sdl POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/../../SDL2_image-2.0.4/lib/x86/libwebp-7.dll" - $) + $) - add_custom_command(TARGET min_eez_sample POST_BUILD + add_custom_command(TARGET eez-flow-template-sdl POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/../../SDL2_image-2.0.4/lib/x86/SDL2_image.dll" - $) + $) - add_custom_command(TARGET min_eez_sample POST_BUILD + add_custom_command(TARGET eez-flow-template-sdl POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/../../SDL2_image-2.0.4/lib/x86/zlib1.dll" - $) + $) endif() if(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten") - add_custom_command(TARGET min_eez_sample POST_BUILD + add_custom_command(TARGET eez-flow-template-sdl POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/src/platform/simulator/emscripten" - $) + $) endif() diff --git a/src/gui/app_context.cpp b/src/gui/app_context.cpp index ac943d3..1bc45c7 100644 --- a/src/gui/app_context.cpp +++ b/src/gui/app_context.cpp @@ -74,12 +74,12 @@ namespace eez { #ifdef _WIN32 if (SUCCEEDED(SHGetFolderPathA(NULL, CSIDL_PROFILE, NULL, 0, file_path))) { - stringAppendString(file_path, sizeof(file_path), "\\.min_eez_sample"); + stringAppendString(file_path, sizeof(file_path), "\\.eez-flow-template-sdl"); _mkdir(file_path); stringAppendString(file_path, sizeof(file_path), "\\"); } #elif defined(__EMSCRIPTEN__) - stringAppendString(file_path, sizeof(file_path), "/min_eez_sample/"); + stringAppendString(file_path, sizeof(file_path), "/eez-flow-template-sdl/"); #else const char *home_dir = 0; if ((home_dir = getenv("HOME")) == NULL) { @@ -87,7 +87,7 @@ namespace eez { } if (home_dir) { stringAppendString(file_path, sizeof(file_path), home_dir); - stringAppendString(file_path, sizeof(file_path), "/.min_eez_sample"); + stringAppendString(file_path, sizeof(file_path), "/.eez-flow-template-sdl"); mkdir(file_path, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); stringAppendString(file_path, sizeof(file_path), "/"); } diff --git a/src/main.cpp b/src/main.cpp index 496ea61..e438687 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -35,8 +35,8 @@ static int g_initialized = false; // clang-format off void mountFileSystem() { EM_ASM( - FS.mkdir("/min_eez_sample"); - FS.mount(IDBFS, {}, "/min_eez_sample"); + FS.mkdir("/eez-flow-template-sdl"); + FS.mount(IDBFS, {}, "/eez-flow-template-sdl"); //Module.print("start file sync.."); diff --git a/src/platform/simulator/emscripten/index.html b/src/platform/simulator/emscripten/index.html index 0914401..98b3f4c 100644 --- a/src/platform/simulator/emscripten/index.html +++ b/src/platform/simulator/emscripten/index.html @@ -16,7 +16,7 @@