Skip to content

Commit

Permalink
feat: Sessions features
Browse files Browse the repository at this point in the history
  • Loading branch information
diegomrno committed Oct 9, 2024
1 parent 9102573 commit 0f18271
Show file tree
Hide file tree
Showing 13 changed files with 281 additions and 299 deletions.
14 changes: 5 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ target_include_directories(vortex_shared PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/main/src
)

if (POLICY CMP0002)
cmake_policy(SET CMP0002 NEW)
endif()

if (POLICY CMP0079)
cmake_policy(SET CMP0079 NEW)
endif()

add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ui/editor ui_editor_build)
target_link_libraries(vortex_shared PUBLIC editor)
Expand Down Expand Up @@ -65,8 +58,8 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ui/editor/app/
PATTERN "*.inl"
)

install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ui/crash_handler/app/
DESTINATION ${INSTALL_INCLUDE_DIR}/ui/crash_handler/app/
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ui/crash_handler/src/
DESTINATION ${INSTALL_INCLUDE_DIR}/ui/crash_handler/src/
PATTERN "*.h"
PATTERN "*.hpp"
PATTERN "*.inl"
Expand All @@ -93,6 +86,9 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ui/crash_handler/assets/
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/desktop/vortex_desktop.desktop
DESTINATION ${INSTALL_MAIN_DIR}/)

install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/vortex_banner.png
DESTINATION ${INSTALL_MAIN_DIR}/)

install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/build/handle_crash.sh
DESTINATION ${INSTALL_BIN_DIR}/)

Expand Down
Binary file added assets/images/vortex_banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

// UI instances
#include "./ui/editor/app/include/editor.h"
#include "./ui/crash_handler/app/include/crash_handler.h"
#include "./ui/crash_handler/crash_handler.hpp"

#include "./main/include/vortex.h"
#include "./main/include/templates/load.h"
Expand Down Expand Up @@ -209,7 +209,7 @@ int main(int argc, char *argv[])

std::thread receiveThread;
std::thread Thread([&]()
{ VortexMaker::VortexCrashHandler(argc, argv); });
{ VortexMaker::VortexCrash(argc, argv); });
receiveThread.swap(Thread);


Expand Down
3 changes: 2 additions & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "Vortex 1.1",
"version": "1.1",
"name": "Vortex"
"image": "vortex_banner.png"
}
6 changes: 3 additions & 3 deletions ui/crash_handler/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ if(NOT TARGET cherry)
endif()

file(GLOB_RECURSE UI_CRASH_HANDLER CONFIGURE_DEPENDS
"${CMAKE_CURRENT_SOURCE_DIR}/app/*.h"
"${CMAKE_CURRENT_SOURCE_DIR}/app/*.hpp"
"${CMAKE_CURRENT_SOURCE_DIR}/app/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/*.h"
"${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp"
)

message(STATUS "UI_CRASH_HANDLER sources: ${UI_CRASH_HANDLER}")
Expand Down
46 changes: 0 additions & 46 deletions ui/crash_handler/app/core/Crash.ypp

This file was deleted.

85 changes: 0 additions & 85 deletions ui/crash_handler/app/include/crash_handler.h

This file was deleted.

68 changes: 0 additions & 68 deletions ui/crash_handler/app/src/crash_handler.cpp

This file was deleted.

Loading

0 comments on commit 0f18271

Please sign in to comment.