From cbb3091bfa678b410ca461acc84ec8568de11cde Mon Sep 17 00:00:00 2001 From: floralrainfall Date: Thu, 6 Jul 2023 20:36:39 -0400 Subject: [PATCH] fix paths --- CMakeLists.txt | 8 +++++--- src/engine/app/humanoid/Humanoid.cpp | 4 ++-- src/{ => include}/engine/app/Name.hpp | 0 src/{ => include}/engine/app/humanoid/Humanoid.hpp | 3 ++- src/{ => include}/engine/app/v8/tree/Instance.hpp | 0 5 files changed, 9 insertions(+), 6 deletions(-) rename src/{ => include}/engine/app/Name.hpp (100%) rename src/{ => include}/engine/app/humanoid/Humanoid.hpp (90%) rename src/{ => include}/engine/app/v8/tree/Instance.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 204a2b8..95028c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,13 +10,13 @@ qt_standard_project_setup() add_library(engine STATIC src/engine/app/humanoid/Humanoid.cpp - src/engine/app/humanoid/Humanoid.hpp + src/include/engine/app/humanoid/Humanoid.hpp src/engine/app/v8/tree/Instance.cpp - src/engine/app/v8/tree/Instance.hpp + src/include/engine/app/v8/tree/Instance.hpp - src/engine/app/Name.hpp src/engine/app/Name.cpp + src/include/engine/app/Name.hpp ) qt_add_executable(player @@ -31,6 +31,8 @@ qt_add_executable(studio src/client/studio/main.cpp ) +target_include_directories(engine PUBLIC include) + target_link_libraries(player PRIVATE Qt6::Core engine) target_link_libraries(studio PRIVATE Qt6::Core engine) target_link_libraries(server PRIVATE engine) \ No newline at end of file diff --git a/src/engine/app/humanoid/Humanoid.cpp b/src/engine/app/humanoid/Humanoid.cpp index 27aa783..8cedf76 100644 --- a/src/engine/app/humanoid/Humanoid.cpp +++ b/src/engine/app/humanoid/Humanoid.cpp @@ -1,6 +1,6 @@ -#include "Humanoid.hpp" +#include RBX::Humanoid::Humanoid() { - + } \ No newline at end of file diff --git a/src/engine/app/Name.hpp b/src/include/engine/app/Name.hpp similarity index 100% rename from src/engine/app/Name.hpp rename to src/include/engine/app/Name.hpp diff --git a/src/engine/app/humanoid/Humanoid.hpp b/src/include/engine/app/humanoid/Humanoid.hpp similarity index 90% rename from src/engine/app/humanoid/Humanoid.hpp rename to src/include/engine/app/humanoid/Humanoid.hpp index e35028f..7d33194 100644 --- a/src/engine/app/humanoid/Humanoid.hpp +++ b/src/include/engine/app/humanoid/Humanoid.hpp @@ -1,5 +1,6 @@ #ifndef __APP_HUMANOID_HUMANOID_HPP__ #define __APP_HUMANOID_HUMANOID_HPP__ +#include namespace RBX { @@ -19,7 +20,7 @@ namespace RBX void computeForce(float force, bool something); void getTorso(); void getHead(); - } + }; } #endif \ No newline at end of file diff --git a/src/engine/app/v8/tree/Instance.hpp b/src/include/engine/app/v8/tree/Instance.hpp similarity index 100% rename from src/engine/app/v8/tree/Instance.hpp rename to src/include/engine/app/v8/tree/Instance.hpp