From f496e379ffeba27450b5c94ef99e3d7e8fbfbe4a Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 15 Dec 2015 22:52:28 +0100 Subject: [PATCH] Merge with develop --- code/ryzom/common/src/game_share/persistent_data_template.h | 2 ++ code/ryzom/tools/client/client_config_qt/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/ryzom/common/src/game_share/persistent_data_template.h b/code/ryzom/common/src/game_share/persistent_data_template.h index 0115febef..ce5cd485c 100644 --- a/code/ryzom/common/src/game_share/persistent_data_template.h +++ b/code/ryzom/common/src/game_share/persistent_data_template.h @@ -119,6 +119,8 @@ STRUCT_VECT - 'i' is the vector index during all read and write operations */ +#include + #ifndef PERSISTENT_CLASS #error PERSISTENT_CLASS not defined #endif diff --git a/code/ryzom/tools/client/client_config_qt/CMakeLists.txt b/code/ryzom/tools/client/client_config_qt/CMakeLists.txt index fbc553bda..83b07623c 100644 --- a/code/ryzom/tools/client/client_config_qt/CMakeLists.txt +++ b/code/ryzom/tools/client/client_config_qt/CMakeLists.txt @@ -68,5 +68,5 @@ IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_configuration_qt ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) ENDIF() -INSTALL(TARGETS ryzom_configuration_qt RUNTIME DESTINATION games COMPONENT client BUNDLE DESTINATION /Applications) +INSTALL(TARGETS ryzom_configuration_qt RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications)