From f7046f21b11fa71750f16c509d1b3cfd53e07d8b Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Mon, 8 Feb 2016 14:37:34 +0100
Subject: [PATCH] Merge with develop

---
 code/CMakeModules/nel.cmake                            |  1 +
 .../client/data/gamedev/interfaces_v3/compass.xml      |  2 +-
 .../client/data/gamedev/interfaces_v3/game_config.xml  | 10 +++++-----
 code/tool/CMakeLists.txt                               |  1 +
 code/tool/bin2c/CMakeLists.txt                         |  8 ++++++++
 5 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 code/tool/CMakeLists.txt
 create mode 100644 code/tool/bin2c/CMakeLists.txt

diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index 1be1a63b9..99aa6ccaf 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -258,6 +258,7 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
   OPTION(WITH_NELNS               "Build NeL Network Services."                   OFF)
   OPTION(WITH_RYZOM               "Build Ryzom Core."                             ON )
   OPTION(WITH_SNOWBALLS           "Build Snowballs."                              OFF)
+  OPTION(WITH_TOOLS               "Build Tools"                                   OFF)
 ENDMACRO(NL_SETUP_DEFAULT_OPTIONS)
 
 MACRO(NL_SETUP_NEL_DEFAULT_OPTIONS)
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/compass.xml b/code/ryzom/client/data/gamedev/interfaces_v3/compass.xml
index 003c90f00..d04d7fba0 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/compass.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/compass.xml
@@ -265,7 +265,7 @@
             fontsize="10"
             line_maxw="182"
             shadow="true"
-            hardtext="No File..." />
+            hardtext="uiNoFiles" />
     </group>
   </group>
   <tree node="mp3_player" />
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
index 0995c64c9..38e63cb24 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
@@ -183,7 +183,7 @@
             posref="BL BL"
             scale="true"
             y="4"
-            w="110"
+            w="130"
             h="2"
             texture="W_line_hor2.tga" />
       <view type="text"
@@ -202,7 +202,7 @@
             posref="MM MM"
             x="0"
             y="-1"
-            w="110"
+            w="130"
             h="8"
             vertical="false"
             align="L"
@@ -246,7 +246,7 @@
             posref="BL BL"
             scale="true"
             y="4"
-            w="110"
+            w="130"
             h="2"
             texture="W_line_hor2.tga" />
       <view type="text"
@@ -265,7 +265,7 @@
             posref="MM MM"
             x="0"
             y="-1"
-            w="110"
+            w="130"
             h="8"
             vertical="false"
             align="L"
@@ -3441,7 +3441,7 @@
                widget="sbint"
                link="UI:SAVE:CHAT:FONT_SIZE"
                min="9"
-               max="14"
+               max="20"
                realtime="true" />
         <param ui="entity_colors:cc_user:c"
                type="db"
diff --git a/code/tool/CMakeLists.txt b/code/tool/CMakeLists.txt
new file mode 100644
index 000000000..5198e56c9
--- /dev/null
+++ b/code/tool/CMakeLists.txt
@@ -0,0 +1 @@
+ADD_SUBDIRECTORY(bin2c)
diff --git a/code/tool/bin2c/CMakeLists.txt b/code/tool/bin2c/CMakeLists.txt
new file mode 100644
index 000000000..adf2787d8
--- /dev/null
+++ b/code/tool/bin2c/CMakeLists.txt
@@ -0,0 +1,8 @@
+FILE(GLOB SRC *.cpp *.h)
+
+ADD_EXECUTABLE(bin2c ${SRC})
+
+NL_DEFAULT_PROPS(bin2c "Tools: bin2c")
+NL_ADD_RUNTIME_FLAGS(bin2c)
+
+INSTALL(TARGETS bin2c RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools)