Skip to content

Commit

Permalink
fix: Submodules + Resources folder
Browse files Browse the repository at this point in the history
  • Loading branch information
diegomrno committed Oct 29, 2024
1 parent 48471e1 commit d674b26
Show file tree
Hide file tree
Showing 119 changed files with 39 additions and 142 deletions.
19 changes: 0 additions & 19 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,6 @@
[submodule "lib/spdlog"]
path = lib/spdlog
url = https://github.com/gabime/spdlog
[submodule "main/builtint/vortex.modules.builtin.toolchains"]
path = main/builtint/vortex.modules.builtin.toolchains
url = https://github.com/infiniteHQ/vortex.modules.builtin.toolchains
branch = main
[submodule "main/builtint/vortex.modules.builtin.packages"]
path = main/builtint/vortex.modules.builtin.packages
url = https://github.com/infiniteHQ/vortex.modules.builtin.packages
branch = main
[submodule "main/builtint/vortex.modules.builtin.tasks"]
path = main/builtint/vortex.modules.builtin.tasks
url = https://github.com/infiniteHQ/vortex.modules.builtin.tasks
branch = main
[submodule "main/builtint/vortex.modules.builtin.tasklists"]
path = main/builtint/vortex.modules.builtin.tasklists
url = https://github.com/infiniteHQ/vortex.modules.builtin.tasklists
branch = main
[submodule "lib/uikit"]
path = lib/uikit
url = https://github.com/infiniteHQ/uikit
[submodule "lib/cherry"]
path = lib/cherry
url = https://github.com/infiniteHQ/Cherry
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ add_executable(vortex ${VORTEX_SOURCES} main.cpp)
target_link_libraries(vortex PRIVATE vortex_shared)

if(UNIX AND NOT APPLE)
set(INSTALL_BASE_DIR /opt/Vortex/${VORTEX_VERSION})
set(INSTALL_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/build/dist/${VORTEX_VERSION})
set(INSTALL_MAIN_DIR ${INSTALL_BASE_DIR}/)
set(INSTALL_BIN_DIR ${INSTALL_BASE_DIR}/bin)
set(INSTALL_INCLUDE_DIR ${INSTALL_BASE_DIR}/include)
Expand Down
2 changes: 1 addition & 1 deletion build/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mkdir build_spdlog
mkdir build

cd build_spdlog && cmake ../../lib/spdlog && make -j$(nproc) install
cd build_spdlog && cmake ../../lib/spdlog && make -j$(nproc)
cd ../build && cmake ../.. && make -j$(nproc) install

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
30 changes: 0 additions & 30 deletions main/builtint/templates/vortex.templates.builtin.gmp/template.json

This file was deleted.

1 change: 0 additions & 1 deletion main/builtint/vortex.modules.builtin.packages
Submodule vortex.modules.builtin.packages deleted from f298a3
1 change: 0 additions & 1 deletion main/builtint/vortex.modules.builtin.sample_cpp
Submodule vortex.modules.builtin.sample_cpp deleted from 1abc23
1 change: 0 additions & 1 deletion main/builtint/vortex.modules.builtin.tasklists
Submodule vortex.modules.builtin.tasklists deleted from 2ed6b7
1 change: 0 additions & 1 deletion main/builtint/vortex.modules.builtin.tasks
Submodule vortex.modules.builtin.tasks deleted from 67d032
1 change: 0 additions & 1 deletion main/builtint/vortex.modules.builtin.toolchains
Submodule vortex.modules.builtin.toolchains deleted from 1abc23
10 changes: 5 additions & 5 deletions ui/crash_handler/crash_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ Cherry::Application *CreateCrash(int argc, char **argv)

spec.DisableTitle = true;
spec.WindowSaves = false;
spec.IconPath = Cherry::GetPath("ressources/imgs/icon_crash.png");
spec.IconPath = Cherry::GetPath("resources/imgs/icon_crash.png");

Cherry::Application *app = new Cherry::Application(spec);
app->SetFavIconPath(Cherry::GetPath("ressources/imgs/icon_crash.png"));
app->AddFont("Consola", Cherry::GetPath("ressources/fonts/consola.ttf"), 17.0f);
app->SetFavIconPath(Cherry::GetPath("resources/imgs/icon_crash.png"));
app->AddFont("Consola", Cherry::GetPath("resources/fonts/consola.ttf"), 17.0f);

app->AddLocale("fr", Cherry::GetPath("ressources/locales/fr.json"));
app->AddLocale("en", Cherry::GetPath("ressources/locales/en.json"));
app->AddLocale("fr", Cherry::GetPath("resources/locales/fr.json"));
app->AddLocale("en", Cherry::GetPath("resources/locales/en.json"));
app->SetDefaultLocale("en");
app->SetLocale("fr");

Expand Down
6 changes: 3 additions & 3 deletions ui/editor/app/core/utils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ static void MyButton(const std::string &name, int w, int h)
}
else
{
drawList->AddImage(Cherry::GetTexture(Cherry::GetPath("ressources/imgs/icons/misc/icon_vortex_default.png")), cursorPos, ImVec2(cursorPos.x + squareSize.x, cursorPos.y + squareSize.y));
drawList->AddImage(Cherry::GetTexture(Cherry::GetPath("resources/imgs/icons/misc/icon_vortex_default.png")), cursorPos, ImVec2(cursorPos.x + squareSize.x, cursorPos.y + squareSize.y));
}

ImVec2 smallRectSize(40, 20);
Expand Down Expand Up @@ -330,7 +330,7 @@ static void VersionButton(const std::string &envproject, int xsize = 100, int ys
}
else
{
drawList->AddImage(Cherry::GetTexture(Cherry::GetPath("ressources/imgs/vortex_banner_unknow.png")), cursorPos, ImVec2(cursorPos.x + squareSize.x, cursorPos.y + squareSize.y));
drawList->AddImage(Cherry::GetTexture(Cherry::GetPath("resources/imgs/vortex_banner_unknow.png")), cursorPos, ImVec2(cursorPos.x + squareSize.x, cursorPos.y + squareSize.y));
}

ImVec2 smallRectSize(40, 20);
Expand Down Expand Up @@ -499,7 +499,7 @@ static void MyButton(const std::shared_ptr<EnvProject> envproject, int xsize = 1
}
else
{
drawList->AddImage(Cherry::GetTexture(Cherry::GetPath("ressources/imgs/icons/misc/icon_vortex_default.png")), cursorPos, ImVec2(cursorPos.x + squareSize.x, cursorPos.y + squareSize.y));
drawList->AddImage(Cherry::GetTexture(Cherry::GetPath("resources/imgs/icons/misc/icon_vortex_default.png")), cursorPos, ImVec2(cursorPos.x + squareSize.x, cursorPos.y + squareSize.y));
}

ImVec2 smallRectSize(40, 20);
Expand Down
Loading

0 comments on commit d674b26

Please sign in to comment.