From 88e0a021a75d1e58705234022779a2b58c5b494d Mon Sep 17 00:00:00 2001 From: rjindael Date: Sun, 16 Jul 2023 20:31:47 -0700 Subject: [PATCH 1/3] some windows fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit todo: - libstdc++ and related libraries either must be linked statically or copied to outpuŧ folder - windeployqt currently tries opening the common project (libCommon.a) --- CMakeLists.txt | 5 +++-- Projects/Client/Common/CMakeLists.txt | 8 ++++++++ Projects/Client/Player/CMakeLists.txt | 7 +++++++ Projects/Client/Server/CMakeLists.txt | 7 +++++++ Projects/Client/Studio/CMakeLists.txt | 6 ++++++ 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35c7c57..33e7535 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,9 +8,10 @@ option(COMPILE_PLAYER "Compile the RNR player" ON) option(COMPILE_STUDIO "Compile the RNR studio" ON) option(COMPILE_SERVER "Compile the RNR server" ON) -set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/dist") set(DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/Dependencies) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes -Wno-return-type") # Ignore warnings generated by Luau and Qt +set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/dist) + +add_compile_options(-Wno-attributes -Wno-return-type) # Ignore warnings generated by Luau and Qt find_package(Boost REQUIRED) find_package(OGRE REQUIRED COMPONENTS Bites CONFIG) diff --git a/Projects/Client/Common/CMakeLists.txt b/Projects/Client/Common/CMakeLists.txt index 6bdd7d1..7999bda 100644 --- a/Projects/Client/Common/CMakeLists.txt +++ b/Projects/Client/Common/CMakeLists.txt @@ -12,5 +12,13 @@ list(APPEND HEADER qt_standard_project_setup() qt_add_library(Common STATIC ${SOURCE} ${HEADER}) +if(WIN32) + add_custom_command(TARGET Common POST_BUILD + COMMAND ${TOOL_WINDEPLOYQT} + $ + COMMENT "Running windeployqt..." + ) +endif() + target_include_directories(Common PUBLIC Header) target_link_libraries(Common PUBLIC ${QT6_LIBRARIES_INCL} Engine) \ No newline at end of file diff --git a/Projects/Client/Player/CMakeLists.txt b/Projects/Client/Player/CMakeLists.txt index 798c405..f28e861 100644 --- a/Projects/Client/Player/CMakeLists.txt +++ b/Projects/Client/Player/CMakeLists.txt @@ -18,6 +18,13 @@ endif() qt_add_executable(Player ${SOURCE} ${HEADER}) +if(WIN32 OR MINGW) + add_custom_command(TARGET Player POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy -t $ $ + COMMAND_EXPAND_LISTS + ) +endif() + target_include_directories(Player PRIVATE Header) target_link_libraries(Player PRIVATE Common Engine) diff --git a/Projects/Client/Server/CMakeLists.txt b/Projects/Client/Server/CMakeLists.txt index 9b42ddc..3ff1c02 100644 --- a/Projects/Client/Server/CMakeLists.txt +++ b/Projects/Client/Server/CMakeLists.txt @@ -9,5 +9,12 @@ endif() add_executable(Server ${SOURCE} ${HEADER}) +if(WIN32 OR MINGW) + add_custom_command(TARGET Server POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy -t $ $ + COMMAND_EXPAND_LISTS + ) +endif() + target_include_directories(Server PRIVATE Header) target_link_libraries(Server PRIVATE Engine) \ No newline at end of file diff --git a/Projects/Client/Studio/CMakeLists.txt b/Projects/Client/Studio/CMakeLists.txt index 9950e48..2509250 100644 --- a/Projects/Client/Studio/CMakeLists.txt +++ b/Projects/Client/Studio/CMakeLists.txt @@ -18,6 +18,12 @@ endif() qt_add_executable(Studio ${SOURCE} ${HEADER}) +if(WIN32 OR MINGW) + add_custom_command(TARGET Studio POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy -t $ $ + COMMAND_EXPAND_LISTS + ) +endif() target_include_directories(Studio PRIVATE Header) target_link_libraries(Studio PRIVATE Common Engine) From 23bbfa0a940a4bbbe2c8e8c6ce99134a64b7a21b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 03:41:35 +0000 Subject: [PATCH 2/3] Bump Dependencies/Luau from `e25de95` to `2181591` Bumps [Dependencies/Luau](https://github.com/roblox/luau) from `e25de95` to `2181591`. - [Release notes](https://github.com/roblox/luau/releases) - [Commits](https://github.com/roblox/luau/compare/e25de95445f2d635a125ab463426bb7fda017093...218159140c7d79ae745e646da721d12331f536f5) --- updated-dependencies: - dependency-name: Dependencies/Luau dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Dependencies/Luau | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dependencies/Luau b/Dependencies/Luau index e25de95..2181591 160000 --- a/Dependencies/Luau +++ b/Dependencies/Luau @@ -1 +1 @@ -Subproject commit e25de95445f2d635a125ab463426bb7fda017093 +Subproject commit 218159140c7d79ae745e646da721d12331f536f5 From 3a043797b463fb13a1e833fbea50d0ced84eda09 Mon Sep 17 00:00:00 2001 From: rjindael Date: Sun, 16 Jul 2023 20:41:56 -0700 Subject: [PATCH 3/3] squash errors/warnings --- Projects/Engine/Header/Helpers/NormalId.hpp | 2 ++ Projects/Engine/Source/App/V8/DataModel/FaceInstance.cpp | 2 -- Projects/Engine/Source/App/V8/World/World.cpp | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Projects/Engine/Header/Helpers/NormalId.hpp b/Projects/Engine/Header/Helpers/NormalId.hpp index 3832735..8e4af31 100644 --- a/Projects/Engine/Header/Helpers/NormalId.hpp +++ b/Projects/Engine/Header/Helpers/NormalId.hpp @@ -1,5 +1,7 @@ #pragma once +#include + namespace RNR { Ogre::Vector3 normalIdVectors[] = { Ogre::Vector3(1, 0, 0), diff --git a/Projects/Engine/Source/App/V8/DataModel/FaceInstance.cpp b/Projects/Engine/Source/App/V8/DataModel/FaceInstance.cpp index cfdf680..f84aab0 100644 --- a/Projects/Engine/Source/App/V8/DataModel/FaceInstance.cpp +++ b/Projects/Engine/Source/App/V8/DataModel/FaceInstance.cpp @@ -1,4 +1,2 @@ -#pragma once - #include #include \ No newline at end of file diff --git a/Projects/Engine/Source/App/V8/World/World.cpp b/Projects/Engine/Source/App/V8/World/World.cpp index 85f5195..dad12b7 100644 --- a/Projects/Engine/Source/App/V8/World/World.cpp +++ b/Projects/Engine/Source/App/V8/World/World.cpp @@ -17,8 +17,6 @@ namespace RNR m_workspace->setParent(m_datamodel); m_tmb = new TopMenuBar(); - - load("/home/caesium/Downloads/Telegram Desktop/Destroy-History-1.rbxl"); } World::~World()