diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f517b1..67f38a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,8 @@ set(CMAKE_CXX_STANDARD 23) include(CMake/CreateResources.cmake) option(COMPILE_PLAYER "Compile the RNR player" ON) -option(COMPILE_PLAYER "Compile the RNR studio" ON) -option(COMPILE_PLAYER "Compile the RNR server" ON) +option(COMPILE_STUDIO "Compile the RNR studio" ON) +option(COMPILE_SERVER "Compile the RNR server" ON) set(DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/Dependencies) diff --git a/Projects/CMakeLists.txt b/Projects/CMakeLists.txt index 1d2e704..1d91cef 100644 --- a/Projects/CMakeLists.txt +++ b/Projects/CMakeLists.txt @@ -1,10 +1,6 @@ include_directories(Engine/Header) +add_subdirectory(${DEPENDENCIES_DIR}/Luau Build) + add_subdirectory(Engine) add_subdirectory(Client) - -add_subdirectory(${DEPENDENCIES_DIR}/Luau Build) -target_link_libraries(Engine Luau.Analysis) -target_link_libraries(Engine Luau.Ast) -target_link_libraries(Engine Luau.Compiler) -target_link_libraries(Engine Luau.VM) \ No newline at end of file diff --git a/Projects/Engine/CMakeLists.txt b/Projects/Engine/CMakeLists.txt index 664add5..8229954 100644 --- a/Projects/Engine/CMakeLists.txt +++ b/Projects/Engine/CMakeLists.txt @@ -1,6 +1,6 @@ project(Engine) -add_library(engine STATIC +add_library(Engine STATIC Header/Helpers/Name.hpp Header/Helpers/Strings.hpp Header/App/V8/DataModel/ForceField.hpp @@ -18,4 +18,4 @@ add_library(engine STATIC Source/Rendering/Adorn.cpp ) -target_link_libraries(Engine PUBLIC ${BOOST_LIBRARIES} cglm) \ No newline at end of file +target_link_libraries(Engine PUBLIC ${BOOST_LIBRARIES} cglm Luau.Analysis Luau.Ast Luau.Compiler Luau.VM) \ No newline at end of file