From ea06408334cd5aac0560a406de780226cc2c1864 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sun, 29 Nov 2015 14:37:14 +0100
Subject: [PATCH] Changed: Use RYZOM_VERSION from config.h (generated by CMake)

---
 code/ryzom/client/src/client_cfg.cpp             | 1 -
 code/ryzom/client/src/commands.cpp               | 5 ++++-
 code/ryzom/tools/patch_gen/patch_gen_service.cpp | 5 ++++-
 code/ryzom/tools/sheets_packer/sheets_packer.cpp | 3 ---
 code/ryzom/tools/stats_scan/service_main.cpp     | 5 ++++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp
index 0d64f3227..dceb0aa36 100644
--- a/code/ryzom/client/src/client_cfg.cpp
+++ b/code/ryzom/client/src/client_cfg.cpp
@@ -39,7 +39,6 @@
 #include "nel/3d/u_scene.h"
 // Game Share.
 #include "game_share/time_weather_season/time_and_season.h"
-#include "game_share/ryzom_version.h"
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
diff --git a/code/ryzom/client/src/commands.cpp b/code/ryzom/client/src/commands.cpp
index d7d0cb210..ebcd14399 100644
--- a/code/ryzom/client/src/commands.cpp
+++ b/code/ryzom/client/src/commands.cpp
@@ -46,7 +46,6 @@
 #include "game_share/generic_xml_msg_mngr.h"
 #include "game_share/visual_slot_manager.h"
 #include "game_share/mode_and_behaviour.h"
-#include "game_share/ryzom_version.h"
 #include "game_share/brick_types.h"
 #include "game_share/time_weather_season/time_and_season.h"
 
@@ -101,6 +100,10 @@
 #include "zone_util.h"
 #include "nel/gui/lua_manager.h"
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 
 //
 // Only the define FINAL_VERSION can be defined on the project, not in this file
diff --git a/code/ryzom/tools/patch_gen/patch_gen_service.cpp b/code/ryzom/tools/patch_gen/patch_gen_service.cpp
index b5f2c1ae2..bee5c4cdd 100644
--- a/code/ryzom/tools/patch_gen/patch_gen_service.cpp
+++ b/code/ryzom/tools/patch_gen/patch_gen_service.cpp
@@ -19,7 +19,10 @@
 #include "nel/misc/common.h"
 #include "nel/misc/file.h"
 
-#include "game_share/ryzom_version.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "game_share/tick_event_handler.h"
 #include "game_share/singleton_registry.h"
 
diff --git a/code/ryzom/tools/sheets_packer/sheets_packer.cpp b/code/ryzom/tools/sheets_packer/sheets_packer.cpp
index b5dc5e951..9b6eef725 100644
--- a/code/ryzom/tools/sheets_packer/sheets_packer.cpp
+++ b/code/ryzom/tools/sheets_packer/sheets_packer.cpp
@@ -30,9 +30,6 @@
 #include <shellapi.h>
 #endif
 
-// game share
-#include "game_share/ryzom_version.h"
-
 // Client
 #include "sheets_packer_init.h"
 
diff --git a/code/ryzom/tools/stats_scan/service_main.cpp b/code/ryzom/tools/stats_scan/service_main.cpp
index ec4a1d30d..ece57465b 100644
--- a/code/ryzom/tools/stats_scan/service_main.cpp
+++ b/code/ryzom/tools/stats_scan/service_main.cpp
@@ -21,7 +21,10 @@
 
 #include "nel/net/service.h"
 
-#include "game_share/ryzom_version.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "game_share/tick_event_handler.h"
 #include "game_share/singleton_registry.h"