Scene graph refactor and null client patch (Segs#635)

* Fix null client patch build.
* Extend the runtime.

Add a templatized Handle for handle-based storage.
Split up prefab/model/axisalignedbox from scene graph
namespace the scene graph parts.

* Architectural changes:

* Handlers/Services now have a separate _interface libraries that users
of given service can be linked with, to provide access to all message classes given service supports.

* introduced 2 new cmake macros to help with adding new handlers:
** `add_messages_library` which scans current directory for headers with message macros
and creates _interface library
** `add_handler` creates a handler library from provided source files, and marks it to link with a correspondng _interface library
* NetStructures library was merged with GameData

Runtime data and scene graph changes:

* Scene graph now learned to properly store most of the information provided by the loaded files.
* Many parts of scene graph use handle based storage.
* Runtime data now also knows how to handle models/textures

MapViewer changes:
* updated to latest lutefisk3d
* no longer uses a custom scene graph loader.
* makes a better use of cached graph nodes.

Misc changes:
* Common needs ACE as a full blown dependency.
* All _interface classes in turn, depend on Common
* Visual studio project view has all targets in proper folders
* Fix output directory paths
* SEGSEventFactory learned how to pack/unpack events to a std::stream.

Author: nemerle

3rd_party/CMakeLists.txt

@@ -1,21 +1,23 @@
 link_directories(${ThirdParty_Install_Dir}/lib)
 
 include(ExternalProject_CEREAL.cmake)
+if(BUILD_COX_MAP_VIEWER)
+#    add_subdirectory(Lute)
+    include(ExternalProject_Lutefisk3D.cmake)
+else()
+endif()
 include(ExternalProject_ACE.cmake)
 if(MINGW) # ERICEDIT: If the OS is Windows:
     add_custom_target( # ERICEDIT: Add a target that depends on authserver.
         libace ALL
-        DEPENDS ${EXECUTABLE_OUTPUT_PATH}/authserver.exe
+        DEPENDS ace_IMP
         )
     add_custom_command( # ERICEDIT: Copy over libACE.dll to the output directory.
         TARGET libace
         POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ace_LIBRARY_SHARED} ${EXECUTABLE_OUTPUT_PATH}
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ace_LIBRARY_SHARED} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
         )
 endif()
-if(BUILD_COX_MAP_VIEWER)
-    include(ExternalProject_Lutefisk3D.cmake)
-endif()
 ########################################################################################
 # Optional components
 ########################################################################################

3rd_party/ExternalProject_Lutefisk3D.cmake

@@ -1,26 +1,75 @@
-libname(lutefisk3d Lutefisk3D)
-ExternalProject_Add(
-   l3d_BUILD
-   GIT_REPOSITORY https://github.com/Lutefisk3D/lutefisk3d
-   GIT_SHALLOW 1
-   UPDATE_COMMAND ""
-   INSTALL_DIR ${ThirdParty_Install_Dir}
-   CMAKE_ARGS -DQt5_DIR:PATH=${Qt5_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_STAGING_PREFIX:PATH=${ThirdParty_Install_Dir} -DCMAKE_INSTALL_PREFIX:PATH=${ThirdParty_Install_Dir}
-   CMAKE_GENERATOR "${CMAKE_GENERATOR}"
-   CMAKE_GENERATOR_TOOLSET ${CMAKE_GENERATOR_TOOLSET}
-   BUILD_BYPRODUCTS ${lutefisk3d_LIBRARY_SHARED} ${lutefisk3d_LIBRARY_IMP}
-)
-ADD_LIBRARY(lutefisk3d_IMP SHARED IMPORTED GLOBAL)
-add_dependencies(lutefisk3d_IMP l3d_BUILD)
-#set_shared_lib_properties(lutefisk3d)
-SET_PROPERTY(TARGET lutefisk3d_IMP APPEND PROPERTY IMPORTED_LOCATION ${lutefisk3d_LIBRARY_SHARED} )
-SET_PROPERTY(TARGET lutefisk3d_IMP APPEND PROPERTY IMPORTED_LOCATION_DEBUG ${lutefisk3d_LIBRARY_SHARED} )
-SET_PROPERTY(TARGET lutefisk3d_IMP APPEND PROPERTY IMPORTED_LOCATION_RELEASE ${lutefisk3d_LIBRARY_SHARED} )
-SET_PROPERTY(TARGET lutefisk3d_IMP APPEND PROPERTY IMPORTED_IMPLIB ${lutefisk3d_LIBRARY_IMP} )
-SET_PROPERTY(TARGET lutefisk3d_IMP APPEND PROPERTY IMPORTED_IMPLIB_RELEASE ${lutefisk3d_LIBRARY_IMP} )
-if(MSVC)
-SET_PROPERTY(TARGET lutefisk3d_IMP APPEND PROPERTY IMPORTED_IMPLIB_DEBUG ${ThirdParty_Install_Dir}/lib/Lutefisk3D_Debug.lib )
+if(FALSE)
+    set(LUTEFISK3D_NETWORK OFF) # don't need it, and it doesn't compile anyway :)
+    add_subdirectory(Lute)
 else()
-    SET_PROPERTY(TARGET lutefisk3d_IMP APPEND PROPERTY IMPORTED_IMPLIB_DEBUG ${lutefisk3d_LIBRARY_IMP_D} )
+	#NOTE: by default lutefisk builds in RelWithDebInfo
+	# for our use case this seems the most optimal build type.
+    libname(lutefisk3d Lutefisk3D)
+    # add the main options for lutefisk, 
+    # NOTE: this only works when Lutefisk is aleady checked-out submodule
+    # this will likely happen, but not just yet.
+    #include(${CMAKE_CURRENT_SOURCE_DIR}/Lute/CMake/LutefiskOptions.cmake)
+    set(LUTEFISK3D_NETWORK OFF) # don't need it, and it doesn't compile anyway :)
+
+    set(lutefisk_cmake_options
+    -DQt5_DIR:PATH=${Qt5_DIR}
+    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+    -DCMAKE_STAGING_PREFIX:PATH=${ThirdParty_Install_Dir}
+    -DCMAKE_INSTALL_PREFIX:PATH=${ThirdParty_Install_Dir}
+    )
+    if(MINGW)
+        set(IMPLIB_PATH ${ThirdParty_Install_Dir}/lib/libLutefisk3D_RelWithDebugInfo.dll.a )
+    endif()
+    # forward LUTEFISK3D_* options to the external project build.
+    get_cmake_property(__cmake_variables VARIABLES)
+    foreach (var ${__cmake_variables})
+        if ("${var}" MATCHES "^LUTEFISK3D_")
+            set(lutefisk_cmake_options ${lutefisk_cmake_options} -D${var}:BOOL=${${var}})
+        endif ()
+    endforeach()
+
+    ExternalProject_Add(
+       l3d_BUILD
+    #   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Lute
+       GIT_REPOSITORY https://github.com/Lutefisk3D/lutefisk3d
+       GIT_SHALLOW 1
+       UPDATE_COMMAND ""
+       INSTALL_DIR ${ThirdParty_Install_Dir}
+       CMAKE_ARGS ${lutefisk_cmake_options}
+       CMAKE_GENERATOR "${CMAKE_GENERATOR}"
+       CMAKE_GENERATOR_TOOLSET ${CMAKE_GENERATOR_TOOLSET}
+       BUILD_BYPRODUCTS ${lutefisk3d_LIBRARY_SHARED} ${lutefisk3d_LIBRARY_IMP} ${IMPLIB_PATH}
+       EXCLUDE_FROM_ALL ON # don't build this when build-all is requested ?
+    )
+    add_library(Lutefisk3D SHARED IMPORTED GLOBAL)
+    target_include_directories(Lutefisk3D INTERFACE ${ThirdParty_Install_Dir}/include)
+    add_dependencies(Lutefisk3D l3d_BUILD)
+    #set_shared_lib_properties(lutefisk3d)
+    set_property(TARGET Lutefisk3D APPEND PROPERTY IMPORTED_LOCATION ${lutefisk3d_LIBRARY_SHARED} )
+    set_property(TARGET Lutefisk3D APPEND PROPERTY IMPORTED_LOCATION_DEBUG ${lutefisk3d_LIBRARY_SHARED} )
+    set_property(TARGET Lutefisk3D APPEND PROPERTY IMPORTED_LOCATION_RELEASE ${lutefisk3d_LIBRARY_SHARED} )
+
+    # add lutefisk defines
+    foreach (var ${__cmake_variables})
+        if ("${var}" MATCHES "^LUTEFISK3D_")
+            if ("${${var}}")
+                target_compile_definitions(Lutefisk3D INTERFACE -D${var})
+            endif ()
+        endif ()
+    endforeach()
+
+    if(MINGW)
+        set_property(TARGET Lutefisk3D PROPERTY IMPORTED_IMPLIB ${IMPLIB_PATH} )
+        set_property(TARGET Lutefisk3D PROPERTY IMPORTED_IMPLIB_DEBUG ${IMPLIB_PATH} )
+        set_property(TARGET Lutefisk3D PROPERTY IMPORTED_IMPLIB_RELWITHDEBINFO ${IMPLIB_PATH} )
+    else()
+        set_property(TARGET Lutefisk3D APPEND PROPERTY IMPORTED_IMPLIB ${lutefisk3d_LIBRARY_IMP} )
+        set_property(TARGET Lutefisk3D APPEND PROPERTY IMPORTED_IMPLIB_RELEASE ${lutefisk3d_LIBRARY_IMP} )
+        if(MSVC)
+            set_property(TARGET Lutefisk3D APPEND PROPERTY IMPORTED_IMPLIB_DEBUG ${lutefisk3d_LIBRARY_IMP} )
+        else()
+            set_property(TARGET Lutefisk3D APPEND PROPERTY IMPORTED_IMPLIB_DEBUG ${lutefisk3d_LIBRARY_IMP} )
+        endif()
+    endif()
+    #set_property(TARGET Lutefisk3D APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS ACE_HAS_DLL=1)
 endif()
-#set_property(TARGET lutefisk3d_IMP APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS ACE_HAS_DLL=1)

include/glm/common.hpp 3rd_party/glm/common.hpp

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.4)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.8)
 PROJECT(SEGS)
 
 set(CMAKE_CXX_STANDARD 14)
@@ -7,17 +7,22 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 IF(MSVC)
     add_definitions( -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DNOMINMAX -D_USE_MATH_DEFINES)
 ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Wuseless-cast -std=c++14"  )
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Wuseless-cast -std=c++14 -Wno-unknown-warning-option")
 ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Wuseless-cast -std=c++14 -Wno-nested-anon-types -Wno-gnu-anonymous-struct -Wno-gnu-zero-variadic-macro-arguments")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Wuseless-cast -std=c++14 -Wno-nested-anon-types -Wno-gnu-anonymous-struct -Wno-gnu-zero-variadic-macro-arguments -Wno-unknown-warning-option")
 endif()
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+set(AUTOGEN_TARGETS_FOLDER ON)
 
 add_definitions(-D__STDC_FORMAT_MACROS)
 
 SET(MAIN_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/3rd_party/include CACHE PATH "Includes")
 SET(MAIN_LIB_PATH ${PROJECT_SOURCE_DIR}/3rd_party/lib CACHE PATH "Libraries")
-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/out) # ERICEDIT: Changed the output directory to the build directory rather than source.
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/out)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/out)
 SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/out)
 SET(CMAKE_INCLUDE_PATH ${MAIN_INCLUDE_PATH})
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts;${CMAKE_MODULE_PATH})
@@ -35,53 +40,11 @@ find_package(Threads REQUIRED)
 include(3rdparty_support)
 set(ThirdParty_Install_Dir ${CMAKE_BINARY_DIR}/3rd_party/built) # ERICEDIT: Changed to CMAKE_BINARY_DIR so that this variable always points to the top level of the build directory.
 add_subdirectory(3rd_party)
-add_definitions(-DACE_HAS_DLL=1) # TODO: this should be set by per-target add_definitions
 link_directories(${PROJECT_SOURCE_DIR}/lib) # ERICEDIT: Changed to lowercase.
 
-SET(QT_MISSING True)
-# msvc only; mingw will need different logic
-IF(MSVC)
-    # look for user-registry pointing to qtcreator
-    GET_FILENAME_COMPONENT(QT_BIN [HKEY_CURRENT_USER\\Software\\Classes\\Applications\\QtProject.QtCreator.cpp\\shell\\Open\\Command] PATH)
-    if(${MSVC_VERSION} VERSION_LESS "1910")
-        MESSAGE(FATAL_ERROR "SEGS requires visual studio 2017 to build")
-    endif()
-
-    # get root path so we can search for 5.3, 5.4, 5.5, etc
-    STRING(REPLACE "/Tools" ";" QT_BIN "${QT_BIN}")
-    LIST(GET QT_BIN 0 QT_BIN)
-    FILE(GLOB QT_VERSIONS "${QT_BIN}/5.*")
-    LIST(SORT QT_VERSIONS)
-
-    # assume the latest version will be last alphabetically
-    LIST(REVERSE QT_VERSIONS)
-
-    LIST(GET QT_VERSIONS 0 QT_VERSION)
-
-    # fix any double slashes which seem to be common
-    STRING(REPLACE "//" "/"  QT_VERSION "${QT_VERSION}")
-
-    # we only support 2017, and qt5 uses vs2015 files for 32 bit build
-    SET(QT_MSVC "2015")
-    # check for 64-bit os
-    # may need to be removed for older compilers as it wasn't always offered
-    if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
-        SET(QT_MSVC "2017_64")
-    endif()
-
-    SET(QT_PATH "${QT_VERSION}/msvc${QT_MSVC}")
-    SET(QT_MISSING False)
-    file(TO_NATIVE_PATH "${QT_PATH}/bin" QT_BIN_DIR_WINDOWS)
-    set(CMAKE_MSVCIDE_RUN_PATH "${QT_BIN_DIR_WINDOWS}" CACHE STATIC "MSVC IDE Run path" FORCE)
-ENDIF()
-
-# use Qt_DIR approach so you can find Qt after cmake has been invoked
-IF(NOT QT_MISSING)
-    MESSAGE("-- Qt found: ${QT_PATH}")
-    SET(Qt5_DIR "${QT_PATH}/lib/cmake/Qt5/")
-    SET(Qt5Test_DIR "${QT_PATH}/lib/cmake/Qt5Test")
-ENDIF()
+include(LocateQt5)
 find_package(Qt5 COMPONENTS Core Sql REQUIRED)
+
 if(ENABLE_TESTS)
     enable_testing()
     find_package(Qt5 COMPONENTS Test REQUIRED)
@@ -96,6 +59,29 @@ if(ENABLE_TESTS)
         )
     endmacro()
 endif()
+
+link_directories(${ThirdParty_Install_Dir}/lib)
+include_directories(SYSTEM ${ThirdParty_Install_Dir}/include)
+include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/3rd_party)
+include_directories(${PROJECT_SOURCE_DIR}/include)
+
+include_directories(Components)
+
+# this has to be visited before scan_event_types macro below has been used
+add_subdirectory(Utilities)
+# this function is here to solve the env paths issue
+function(to_path_list var path1)
+    if("${CMAKE_HOST_SYSTEM}" MATCHES ".*Windows.*")
+        set(sep "\\;")
+    else()
+        set(sep ":")
+    endif()
+    set(result "${path1}") # First element doesn't require separator at all...
+    foreach(path ${ARGN})
+        set(result "${result}${sep}${path}") # .. but other elements do.
+    endforeach()
+    set(${var} "${result}" PARENT_SCOPE)
+endfunction()
 ##############################################
 # Event registration support functionality
 macro(scan_event_types group) # followed by a list of directories to scan
@@ -105,9 +91,10 @@ macro(scan_event_types group) # followed by a list of directories to scan
         file(GLOB headers ${path}/*.h)
         list(APPEND all_headers ${headers})
     endforeach()
-
+    to_path_list(path_with_qt5 $ENV{PATH} ${Qt5_BIN_DIR} )
+    # for event_gen we first add qt5 binary path to allow it to run during build.
     add_custom_command(
-        COMMAND event_gen scan_events ${group} ${CMAKE_CURRENT_BINARY_DIR}/ ${ARGN}
+        COMMAND ${CMAKE_COMMAND} -E env "PATH=${path_with_qt5}" $<SHELL_PATH:$<TARGET_FILE:event_gen>> scan_events ${group} ${CMAKE_CURRENT_BINARY_DIR}/ ${ARGN}
         OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/${group}.gen.cpp
         DEPENDS event_gen ${all_headers}
         COMMENT "Generating ${group} implementation source"
@@ -117,19 +104,34 @@ macro(add_event_sources group tgt_var)
     list(APPEND ${tgt_var} ${CMAKE_CURRENT_BINARY_DIR}/${group}.gen.cpp)
     message("adding ${group} to sources")
 endmacro()
-##############################################
-
-link_directories(${ThirdParty_Install_Dir}/lib)
-include_directories(SYSTEM ${ThirdParty_Install_Dir}/include)
-include_directories(${PROJECT_SOURCE_DIR}/include)
+macro(add_messages_library name )
+    #find handler's events
+    scan_event_types(${name}Events ${CMAKE_CURRENT_SOURCE_DIR})
+    add_event_sources(${name}Events ${name}_SOURCES)
+    add_library(${name}_interface STATIC ${${name}_SOURCES} ${ARGN})
+    # allow all headers to refer to events by their dir/name.h
+    target_include_directories(${name}_interface PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
+    target_link_libraries(${name}_interface PUBLIC Qt5::Core)
+    # all interfaces use stuff from Common, so should depend/link to it
+    target_link_libraries(${name}_interface PUBLIC SEGS_Components)
+	source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${ARGN}) 
+	set_target_properties (${name}_interface PROPERTIES
+		FOLDER Projects/CoX/Common/Messages
+	)
+endmacro()
 
-include_directories(Components)
+macro(add_handler name)
+    # TODO: consider add_subdirectory(../../Common/Messages/${name}) to force existence/building of interface lib
+    # add the implementation library
+    add_library(${name} STATIC ${ARGN})
+    target_link_libraries(${name} PUBLIC ${name}_interface)
+endmacro()
+##############################################
 
 add_subdirectory(Components)
-add_subdirectory(Utilities)
 add_subdirectory(Projects)
 
-file(MAKE_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/data)
+file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/data)
 
 set(MAPNAMES
   City_00_01
@@ -150,5 +152,5 @@ set(MAPNAMES
   Trial_05_01
   )
 foreach(MAPDIR ${MAPNAMES})
-  file(MAKE_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/DefaultMapInstances/${MAPDIR})
+  file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DefaultMapInstances/${MAPDIR})
 endforeach(MAPDIR)

include/glm/copying.txt 3rd_party/glm/copying.txt

@@ -0,0 +1,54 @@
+SET(QT_MISSING True)
+# msvc only; mingw will need different logic
+IF(MSVC)
+    # look for user-registry pointing to qtcreator
+    GET_FILENAME_COMPONENT(QT_BIN [HKEY_CURRENT_USER\\Software\\Classes\\Applications\\QtProject.QtCreator.cpp\\shell\\Open\\Command] PATH)
+    if(${MSVC_VERSION} VERSION_LESS "1910")
+        MESSAGE(FATAL_ERROR "SEGS requires visual studio 2017 to build")
+    endif()
+
+    # get root path so we can search for 5.3, 5.4, 5.5, etc
+    STRING(REPLACE "/Tools" ";" QT_BIN "${QT_BIN}")
+    LIST(GET QT_BIN 0 QT_BIN)
+    FILE(GLOB QT_VERSIONS "${QT_BIN}/5.*")
+    LIST(SORT QT_VERSIONS)
+
+    # assume the latest version will be last alphabetically
+    LIST(REVERSE QT_VERSIONS)
+
+    LIST(GET QT_VERSIONS 0 QT_VERSION)
+
+    # fix any double slashes which seem to be common
+    STRING(REPLACE "//" "/"  QT_VERSION "${QT_VERSION}")
+
+    # we only support 2017, and qt5 uses vs2015 files for 32 bit build
+    SET(QT_MSVC "2015")
+    # check for 64-bit os
+    # may need to be removed for older compilers as it wasn't always offered
+    if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
+        SET(QT_MSVC "2017_64")
+    endif()
+
+    SET(QT_PATH "${QT_VERSION}/msvc${QT_MSVC}")
+    SET(QT_MISSING False)
+    file(TO_NATIVE_PATH "${QT_PATH}/bin" QT_BIN_DIR_WINDOWS)
+    set(CMAKE_MSVCIDE_RUN_PATH "${QT_BIN_DIR_WINDOWS}" CACHE STATIC "MSVC IDE Run path" FORCE)
+ENDIF()
+
+MACRO(TO_NATIVE_PATH PATH OUT)
+        FILE(TO_NATIVE_PATH "${PATH}" "${OUT}")
+        IF(MINGW)
+                STRING(REPLACE "/" "\\" "${OUT}" "${${OUT}}")
+        ENDIF(MINGW)
+ENDMACRO(TO_NATIVE_PATH)
+# use Qt_DIR approach so you can find Qt after cmake has been invoked
+IF(NOT QT_MISSING)
+    MESSAGE("-- Qt found: ${QT_PATH}")
+    SET(Qt5_DIR "${QT_PATH}/lib/cmake/Qt5/")
+    SET(Qt5Test_DIR "${QT_PATH}/lib/cmake/Qt5Test")
+ENDIF()
+find_package(Qt5 REQUIRED COMPONENTS Core)
+get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
+get_filename_component(Qt5_BIN_DIR "${_qmake_executable}" DIRECTORY)
+TO_NATIVE_PATH("${Qt5_BIN_DIR}" Qt5_BIN_DIR)
+

include/glm/detail/_features.hpp 3rd_party/glm/detail/_features.hpp

@@ -236,6 +236,11 @@ void BitStream::StoreString(const char *str)
     m_write_off  += idx;
 }
 
+void BitStream::StoreString(const QByteArray &str)
+{
+    StoreString(str.constData());
+}
+
 void BitStream::StoreString(const QString &str)
 {
     StoreString(qPrintable(str));
@@ -367,10 +372,10 @@ int64_t BitStream::Get64Bits()
     return result;
 }
 
-size_t BitStream::GetAvailSize() const
+uint32_t BitStream::GetAvailSize() const
 {
     int64_t res = int64_t(m_size)- int64_t(m_write_off)-(m_write_bit_off!=0);
-    return size_t(std::max<int64_t>(0,res));
+    return uint32_t(std::max<int64_t>(0,res));
 }
 /************************************************************************
 Function:    GetFloat/GetFloatWithDebugInfo()