Merge branch 'trunk' of github.com:lrre-foss/rnr into trunk

This commit is contained in:
floralrainfall 2023-07-16 23:44:10 -04:00
commit 309e9fbc33
7 changed files with 32 additions and 5 deletions

View File

@ -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)

2
Dependencies/Luau vendored

@ -1 +1 @@
Subproject commit e25de95445f2d635a125ab463426bb7fda017093
Subproject commit 218159140c7d79ae745e646da721d12331f536f5

View File

@ -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}
$<TARGET_FILE:Common>
COMMENT "Running windeployqt..."
)
endif()
target_include_directories(Common PUBLIC Header)
target_link_libraries(Common PUBLIC ${QT6_LIBRARIES_INCL} Engine)

View File

@ -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 $<TARGET_FILE_DIR:Player> $<TARGET_RUNTIME_DLLS:Player>
COMMAND_EXPAND_LISTS
)
endif()
target_include_directories(Player PRIVATE Header)
target_link_libraries(Player PRIVATE Common Engine)

View File

@ -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 $<TARGET_FILE_DIR:Server> $<TARGET_RUNTIME_DLLS:Server>
COMMAND_EXPAND_LISTS
)
endif()
target_include_directories(Server PRIVATE Header)
target_link_libraries(Server PRIVATE Engine)

View File

@ -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 $<TARGET_FILE_DIR:Studio> $<TARGET_RUNTIME_DLLS:Studio>
COMMAND_EXPAND_LISTS
)
endif()
target_include_directories(Studio PRIVATE Header)
target_link_libraries(Studio PRIVATE Common Engine)

View File

@ -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()