Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2015-12-15 22:52:28 +01:00
parent 58b2b69da5
commit f496e379ff
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/common/src/game_share/persistent_data_template.h
View file

@ -119,6 +119,8 @@
STRUCT_VECT - 'i' is the vector index during all read and write operations STRUCT_VECT - 'i' is the vector index during all read and write operations
*/ */
#include <limits>
#ifndef PERSISTENT_CLASS #ifndef PERSISTENT_CLASS
#error PERSISTENT_CLASS not defined #error PERSISTENT_CLASS not defined
#endif #endif

2
code/ryzom/tools/client/client_config_qt/CMakeLists.txt
View file

@ -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) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_configuration_qt ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
ENDIF() 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)